XX-10907:  Fix for TLS issues behind NAT