Merge branch 'release/1.7.0' into develop
Move to a new package.
Merge branch 'develop'