Pull bugzilla-9262 into release branch