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