Merge "Ensure OVERTYPE event has an entity type."