Pull bugzilla-7465 into release branch