Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r484b185f0cf4b2ea0ba9de331573952b1b5124b4 -rb631516f8159c25ba2ffd215afa696795d97a28c
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 484b185f0cf4b2ea0ba9de331573952b1b5124b4)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision b631516f8159c25ba2ffd215afa696795d97a28c)
@@ -1081,12 +1081,13 @@
 {
     BOOL result = FALSE;
 
-    if ( message->hdr.payloadLen == 0 )
+    if ( message->hdr.payloadLen == sizeof( U32 ) )
     {
-        if ( DG_MODE_STAN == getCurrentOperationMode() )
-        {
-            result = requestWaterSample();
-        }
+        SAMPLE_WATER_CMD_T sampleWaterCmd;
+
+        result = TRUE;
+        memcpy( &sampleWaterCmd, message->payload, sizeof( U32 ) );
+        waterSampleCommandHandler( sampleWaterCmd );
     }
 
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );