Pull bugzilla-7200 into release branch