Merge with 1.7.0