Bump 1.7.0
Merge branch 'develop'