Pull bugzilla-9429 into release branch