Pull bugzilla-9327 into release branch