Merge branch 'release/2.2.2' into develop
Revert "Bump to version 2.2.2"

This reverts commit 028dfda0f802c7b78bb66577158f1eaa3b325134.
Merge branch 'develop'