Pull bugzilla-9494 into release branch