Pull bugzilla-9345 into release branch