Merge branch 'release/v2.2' into develop
bumped version to 2.2.1
Merge branch 'release/v2.2.1'