Pull bugzilla-9535 into release branch