Merge "Use UID as requestID"