Hotfix to change namespace
Merge branch 'hotfix-namespace' into develop