Pull bugzilla-1641 into release branch