Merge pull request #18950 from MegaphoneJon/event-44