Merge "Update TRANS opcode in ApfGenerator for discard/transmit buffer" into main