Planner cleaning: cleanup and refactor #16569
+452
−369
Merged
Loading