Merge branch 'release/2.2.0' into develop
Fix test utils
Update version
Merge branch 'release/2.2.1'