Merge "Don't pass Config to NamespaceInfo"