Merge branch 'release/1.6.0' into develop
Merge branch 'release/1.6.0'