changes before cherrypick
after cherrypick
changed to more generic namespacing