DBC 1132 - Implements new namespaces.
Merge branch 'DBC-1132' into develop