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