Merge "fix plan generation" into nyc-dev