[Sprint: 39] [master + backport] XD-2397: Fix CNFE in tcp-client module