Merge pull request #18761 from MegaphoneJon/event43-test