Do we need to also pass RETURN_CLIENT_REQUEST_ID=true?