Pull bugzilla-8842 into release branch