Merge branch 'release/1.2.1' into production
Merge tag 'v1.2.1'

1.2.1