release 1.7.0 changes
Merge branch 'release/1.7.0' into develop