Restoring old changeset lost by previous merge
Allowing namespaces in standalone registry