Fiddle with namespaces
Merging with upstream