Merge "registration: Support conditionally registered namespaces"