Enhancement: Do not overwrite requestId if extra already has one
Merge branch 'feature/#6178-do-not-overwrite-request-id' into develop

Close #6178