Merge new planner upload into old one in the codebase

Uncategorized