EventContent fix for 71X

EventContent fix for 71X
Backport of #4905