Updated multi-packet handling