Pull bugzilla-8973 into release branch