merge for 1.7.0