Pull bugzilla-8346 into release branch