Merge branch 'hotfix/2.1.10'
Merge branch 'release/2.2.0'
Minor typo fix.
Merge branch 'hotfix/2.2.1' into develop