Expedient + VTPlanner: final merge