Merge branch 'release/1.2.1' into dev
Merge branch 'master' into dev
remove extra space
bump version
Merge branch 'release/1.2.2'