Allow hyphens in namespaces. Upstream-commit: ef1dee700cd3142b8fad6dc33553a6633e0b9546 Component: engine