Merge branch 'release/1.1.6' into production
Merge tag 'v1.1.6'

1.1.6