Merge branch 'release/1.2.12' into production
Merge tag 'v1.2.12'

1.2.12