Merge branch 'hotfix/1.6.1'
Merge branch 'release/1.7.0'
Bug fix
Merge branch 'hotfix/1.7.1' into develop