Pull bugzilla-8768 into release branch