First drop of 1.7.2 support