Pull bugzilla-9798 into release branch