Pull bugzilla-8798 into release branch