Merge branch 'hotfix/2.2.2.1'
I is stupid
Merge branch 'hotfix/2.2.2.2' into develop