Enable TCP on server
(cherry picked from commit 6943568)
Enable TCP on client