Manual merge from new changes to main Emergence repo with namespaces