Merge branch 'release/2.2.0' into develop
Bump version to 2.2.1
Merge branch 'release/2.2.1'