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