Pull bugzilla-9627 into release branch