backport changeset 7443