Fix our version
Merge branch 'hotfix/v1.2.1'