Update to 1.2.1
Merge branch 'release/1.2.1' into develop