Merge branch 'hotfix/v.1.2.1'
Updated to ver1.2.1
Merge branch 'hotfix/v1.2.1' into develop