Merge "Update nodePorts list" into dublin