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

Support release