Merge "Reconfigure nodeport usage"