Pull bugzilla-3774 into release branch