Pull bugzilla-7907 into release branch