Merge branch 'release/2.2.2' into develop
Merge branch 'master' into develop
some refactorings
Version bump to 2.2.3
Merge branch 'release/2.2.3'