Pull bugzilla-8459 into release branch