Pull bugzilla-9362 into release branch