Pull bugzilla-8385 into release branch