Merge "Fix bug in setting udp ports"