added 2.73 backport stuff