Pull bugzilla-7897 into release branch