Pull bugzilla-9747 into release branch