Pull bugzilla-5737 into release branch