Merge branch 'release/1.2.11' into production
Merge tag 'v1.2.11'

1.2.11