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