Merge branch 'hotfix/v2.2.1' into develop