Fork for fixes

TcpClient.h/shortlog@a156d3de5647: not found in manifest