Switch to RAET-compatible event listener
Merge pull request #18543 from whiteinge/raet-compat-event-listen

Switch to RAET-compatible event listener