I'm moving issue 7104 to the next milestone, it's just a reminder and shouldn't block the release