Make namespaces code blocks again
Merge branch 'feature/namespace-tweak'