Merge branch 'release/2.2.1' into develop
Prevent NPE
Bump version
Merge branch 'release/2.2.2'