Merge pull request #16358 from MegaphoneJon/event-30