Patch with AddPacketHeader and HLT buffer filling up prevention