Pull bugzilla-292300 into release branch