Pull bugzilla-6316 into release branch