Updated the version to 1.2.1
Merge branch 'release-v1.2.1' into dev