Merge "Fix dynamic generation of DNS ips"