Merge "Fix UserdId value when beam is not supported"