Pull bugzilla-7570 into release branch