Merge branch 'release/1.1.7' into production
Merge tag 'v1.1.7'

1.1.7