Merge branch 'release/v1.1.6'
Merge tag 'v1.1.6' into develop

v1.1.6