Merge branch 'release/1.21.0' into develop
Bumped the version up to 1.22-SNAPSHOT
maven version bump
Merge branch 'release/1.22.0'