JBTM-1365. Fixed IPv6 issues