Up to 1.7.0