Merge branch 'release/1.2.0' into develop
hot fix
bump version 1.2.1
Merge branch 'release/1.2.1'