Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r75868c86d86060f8ec8fde969a479e186e51d9a0 -r213c09d4f8c37e562611df2539f73ffaea022f83
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 75868c86d86060f8ec8fde969a479e186e51d9a0)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 213c09d4f8c37e562611df2539f73ffaea022f83)
@@ -1243,6 +1243,7 @@
         stateTimer       = getMSTimerCount();
         // The drain is set to start from reservoir 2
         setValveState( VRD2, VALVE_STATE_OPEN );
+        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
         setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
     }
 
Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -r8ebab816fadec93b2f3c6a42f15a07c26b3a4f59 -r213c09d4f8c37e562611df2539f73ffaea022f83
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 8ebab816fadec93b2f3c6a42f15a07c26b3a4f59)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 213c09d4f8c37e562611df2539f73ffaea022f83)
@@ -800,6 +800,7 @@
 
         // The drain is set to start from reservoir 2
         setValveState( VRD2, VALVE_STATE_OPEN );
+        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
         setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
 
         // Start the timer for drain timeout
Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -r75868c86d86060f8ec8fde969a479e186e51d9a0 -r213c09d4f8c37e562611df2539f73ffaea022f83
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 75868c86d86060f8ec8fde969a479e186e51d9a0)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 213c09d4f8c37e562611df2539f73ffaea022f83)
@@ -864,6 +864,7 @@
         setValveState( VPI, VALVE_STATE_CLOSED );
         setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
         setValveState( VRD2, VALVE_STATE_OPEN );
+        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
 
         // Set both reservoirs to be considered as full
         rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r1c736261f1c4107c556710fe71da9f093fb89d4d -r213c09d4f8c37e562611df2539f73ffaea022f83
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 1c736261f1c4107c556710fe71da9f093fb89d4d)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 213c09d4f8c37e562611df2539f73ffaea022f83)
@@ -1513,6 +1513,7 @@
         // The drain is set to start from reservoir 2 since all the actuators have been de-energized
         // Set the drain valve to reservoir 2
         setValveState( VRD2, VALVE_STATE_OPEN );
+        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
         setDrainPumpTargetRPM( targetRPM );
     }
 
Index: firmware/App/Modes/ModeHeatDisinfectActiveCool.c
===================================================================
diff -u -r52f076a439f5a20cd0fe1659ee5d95f5324fe856 -r213c09d4f8c37e562611df2539f73ffaea022f83
--- firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision 52f076a439f5a20cd0fe1659ee5d95f5324fe856)
+++ firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision 213c09d4f8c37e562611df2539f73ffaea022f83)
@@ -627,6 +627,7 @@
         // The drain is set to start from reservoir 2 since all the actuators have been de-energized
         // Set the drain valve to reservoir 2
         setValveState( VRD2, VALVE_STATE_OPEN );
+        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
         setDrainPumpTargetRPM( targetRPM );
 
         // Start the timer for drain timeout