Pull bugzilla-3241 into release branch