Isolated fix from v1.80-disconnected-tests for TCP ports issue (not tested yet)