Pull bugzilla-5452 into release branch