1.7.2 backporting fixes