Issues #360, #362, #417 - TCP Rewrite (grouped commit)

Grouped commit of the rewritten TCP-UDP binding