Platform changes from 7.x

Improved support for IPv6