Pull bugzilla-5764 into release branch