Merge branch 'release/1.7.0' into production
Merge tag 'v1.7.0'

1.7.0