Merge branch 'release/v2.1.2' into develop
bumped version to 2.2
Merge branch 'release/v2.2'