[BUGFIX] Incomplete migration to namespaces
Merge branch 'development' into staging