Bumped versions
Merge branch 'release/2.22.0' into develop
Bumped versions