Pull bugzilla-9683 into release branch