Move Event handling upstream

Bock, Andyrequested to merge
(removed):main into main

Moved event handling upstream

Merge request reports