Pull bugzilla-8171 into release branch