Pull bugzilla-5966 into release branch