some 1.7.2 backports