Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r86eec09ab556fbd970ddcae9dc622727928ee757 -r379f78f1fad668d741b3ccf1e78c69f3fccc45b5
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 86eec09ab556fbd970ddcae9dc622727928ee757)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 379f78f1fad668d741b3ccf1e78c69f3fccc45b5)
@@ -97,7 +97,12 @@
     // set initial actuator states
     setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
     setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
+#ifndef V_2_SYSTEM
+    setValveState( VRD1, VALVE_STATE_CLOSED );
+    setValveState( VRD2, VALVE_STATE_CLOSED );
+#else
     setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
+#endif
     setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
     setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
@@ -181,7 +186,11 @@
         flushFilterRequest = FALSE;
         filterFlushStartTime = getMSTimerCount();
         setValveState( VPI, VALVE_STATE_OPEN );
-        setValveState( VPD, VALVE_STATE_OPEN );      // TODO: VPD drain state is closed for V3
+#ifndef V_2_SYSTEM
+        setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+#else
+        setValveState( VPD, VALVE_STATE_OPEN );  // TODO: VPD drain state is closed for V3
+#endif
         state = DG_STANDBY_MODE_STATE_FLUSH_FILTER;
     }
     else if ( TRUE == pendingStartDGRequest )
@@ -246,7 +255,11 @@
     if ( TRUE == endSampleWaterRequest )
     {
         setValveState( VPI, VALVE_STATE_CLOSED );
+#ifndef V_2_SYSTEM
+        setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
+#else
         setValveState( VPD, VALVE_STATE_CLOSED );
+#endif
         state = DG_STANDBY_MODE_STATE_IDLE;
     }
 
@@ -269,7 +282,12 @@
     if ( ( TRUE == stopSampleWaterRequest ) || ( TRUE == didTimeout( waterSampleStartTime, MAX_WATER_SAMPLE_TIME_MS ) ) )
     {
         setValveState( VSP, VALVE_STATE_CLOSED );
+
+#ifndef V_2_SYSTEM
+        setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
+#else
         setValveState( VPD, VALVE_STATE_OPEN );     // TODO: VPD drain state is closed for V3
+#endif
         state = DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE;
     }
 
@@ -420,6 +438,8 @@
         requestNewOperationMode( DG_MODE_CHEM );
         status = TRUE;
     }
+
+    return status;
 }
 
 /*********************************************************************//**