Merge pull request #21803 from colemanw/APIv4EntityEvent