Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rebbb1f85550a1f9b8f946655f7b2b63f76fbf67d -r99b0c8f1ff9f9319f68e5043cd8c007e317a05c0
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision ebbb1f85550a1f9b8f946655f7b2b63f76fbf67d)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 99b0c8f1ff9f9319f68e5043cd8c007e317a05c0)
@@ -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,11 @@
     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;
     }
 
@@ -359,6 +376,29 @@
 
 /*********************************************************************//**
  * @brief
+ * The startDGFlush function starts DG flush mode.
+ * @details Inputs: standbyState
+ * @details Outputs: none
+ * @return: TRUE if the switch was successful, otherwise FALSE
+ *************************************************************************/
+BOOL startDGFlush( void )
+{
+    BOOL result = FALSE;
+
+    // If DG is in standby mode or in the solo mode and the standby mode is in Idle state, request DG flush
+    if ( ( DG_MODE_STAN == getCurrentOperationMode() && DG_STANDBY_MODE_STATE_IDLE == standbyState ) ||
+           DG_MODE_SOLO == getCurrentOperationMode() )
+    {
+        requestNewOperationMode( DG_MODE_FLUS );
+
+        result = TRUE;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The startDGHeatDisinfect function starts heat disinfect mode.
  * @details Inputs: standbyState
  * @details Outputs: none