Merge branch 'hotfix/1.2.1'
Version 1.2.2.
Merge.