Merge "Fix Guest string was not translated in UMS.userWithName()" into tm-dev