Merge "Fix behaviour of namespaceSelector to match the documentation"