Merge branch 'release/1.2.0' into develop
Merge branch 'master' into develop
Fix version module
Version bump to v1.2.1
Merge branch 'release/1.2.1'