new fix 1.2
Merge branch 'hotfix/v1.2'
a commit message