Pull bugzilla-8709 into release branch