Merge "Do not overwrite requestId"