Bump version (1.7.0)
Merge branch 'dev'