Resolve "Include Client ID in EVAL_RESULT msg"

Merged Francis Dupont requested to merge 2854-include-client-id-in-eval_result-msg into master

Merge request reports