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

testing