Merge "bump the master version to 1.7.0"