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

1.7.0
Starting 1.8.0