Pull bugzilla-6859 into release branch