Merge branch 'hotfix/v2.2.1'
Add target type
Merge branch 'hotfix/v2.2.2' into develop