CLC-4580 Use the response event ID if we have it
Merge pull request #3213 from ctweney/clc-4580

CLC-4580 Use the response event ID if we have it