Refactor disabling of namespaces and refactor code
Merge branch 'release/0.11.0' into develop