Pull bugzilla-9194 into release branch