Merge "Add missing enterprise string" into tm-dev