Upped version to 1.22
Merge branch 'hotfix/1.22'