switching from rebuild to dmdd namespace
some fixes
Merge branch 'feature/namespace' into develop