Merge "Fix NPE for null plans" into main