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

1.6.0