Merge branch 'hotfix/v2.2.2' into develop