421.01 Sync planner changes with G2