Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r5fa15db8e36792f83650711ab29755912d229437 -rafdf53e4c6c89d257f9b595f08b21077dadc9328
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 5fa15db8e36792f83650711ab29755912d229437)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision afdf53e4c6c89d257f9b595f08b21077dadc9328)
@@ -37,7 +37,7 @@
 // ********** private definitions **********
 
 #define FILTER_FLUSH_TIME_MS                ( 120 * MS_PER_SECOND )                     ///< Duration of filter flush state (in ms).
-#define WATER_SAMPLE_TIME_MS                ( 10 * MS_PER_SECOND )                      ///< Duration of water sample state (in ms).
+#define MAX_WATER_SAMPLE_TIME_MS            ( 5 * MS_PER_SECOND )                       ///< Maximum duration of water sample state (in ms).
 #define FLUSH_EXPIRATION_TIME_MS            ( 10 * SEC_PER_MIN * MS_PER_SECOND )        ///< Duration in which a filter flush is valid (in ms).
 #define FILTER_FLUSH_DATA_PUBLISH_INTERVAL  ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )   ///< Filter flush data broadcast interval.
 
@@ -176,7 +176,7 @@
         flushFilterRequest = FALSE;
         filterFlushStartTime = getMSTimerCount();
         setValveState( VPI, VALVE_STATE_OPEN );
-        setValveState( VPD, VALVE_STATE_OPEN );
+        setValveState( VPD, VALVE_STATE_OPEN );      // TODO: VPD drain state is closed for V3
         state = DG_STANDBY_MODE_STATE_FLUSH_FILTER;
     }
     else if ( TRUE == pendingStartDGRequest )
@@ -261,10 +261,10 @@
     DG_STANDBY_MODE_STATE_T state = DG_STANDBY_MODE_STATE_SAMPLE_WATER;
 
     // After HD requests to stop or 10 seconds has elapsed, close and return to idle state
-    if ( ( TRUE == stopSampleWaterRequest ) || ( TRUE == didTimeout( waterSampleStartTime, WATER_SAMPLE_TIME_MS ) ) )
+    if ( ( TRUE == stopSampleWaterRequest ) || ( TRUE == didTimeout( waterSampleStartTime, MAX_WATER_SAMPLE_TIME_MS ) ) )
     {
         setValveState( VSP, VALVE_STATE_CLOSED );
-        setValveState( VPD, VALVE_STATE_OPEN );
+        setValveState( VPD, VALVE_STATE_OPEN );     // TODO: VPD drain state is closed for V3
         state = DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE;
     }