Merge branch 'release/v1.6' into develop