Pull bugzilla-5534 into release branch