Merge branch 'hotfix-1.22.1'
Fix spelling.
Merge branch 'hotfix-1.22.2' into develop