Pull bugzilla-8066 into release branch