Pull bugzilla-5637 into release branch