Merge "AnotherPacketSource: return format of first non-discontinuity packet"