Merge "Fix ipv6 deploy failure"