Pull bugzilla-5653 into release branch