Pull bugzilla-7880 into release branch