Pull bugzilla-8630 into release branch