Fixed missing classes in namespaces compatibility layer during setup phase
Merge branch 'develop' of github.com:innomatic/innomatic into develop