Pull bugzilla-7887 into release branch