Merge branch 'release/1.1.8' into production
Merge tag 'v1.1.8'

1.1.8