Moving this ticket to 5.6.0.CR1 on the current sprint, because the fix may be easy after all. I'll try, and if the fix doesn't work I'll move it back to 6.0.