Merge "Use std::unique_ptr for DispatchEntry" into main