Pull bugzilla-7122 into release branch