Merge "BUG-1770: emit proper namespaces"