Merge "Use EventEntry fields as defaults for DispatchEntry" into main