Updated version number
Merge branch 'release/v1.2.1' into dev