Merge "Correct NodePorts table"