Merge "Bump up version to 1.7.0"