Merge pull request #18888 from calavera/event_types

Event all the things!