version 1.7.0
Merge branch 'release/1.7.0' into develop