Merge branch 'hotfix/2.2.2'
typo on Fabian description
Merge branch 'hotfix/2.2.3' into dev