Merge "Revive the code to support TCP interleaved transport"