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