TCPReaderHandler and TCPSenderHandler.
Merged conflict.
Largely done.