Merge pull request #23311 from colemanw/unusedEvent