Index: firmware/App/Modes/SampleWater.c
===================================================================
diff -u -r3db5538afb80bc12822304d698343e0325fa708e -re6e0e56ed9769723d5e4a561a9dfe4b16ad058e6
--- firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 3db5538afb80bc12822304d698343e0325fa708e)
+++ firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision e6e0e56ed9769723d5e4a561a9dfe4b16ad058e6)
@@ -87,22 +87,31 @@
 *************************************************************************/
 void execSampleWater( void )
 {
-    switch ( currentSampleWaterState )
+#ifndef _RELEASE_
+    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) )
     {
-        case SAMPLE_WATER_SETUP_STATE:
-            currentSampleWaterState = handleWaterSampleSetupState();
-            break;
+        currentSampleWaterState = SAMPLE_WATER_COMPLETE_STATE;
+    }
+    else
+#endif
+    {
+        switch ( currentSampleWaterState )
+        {
+            case SAMPLE_WATER_SETUP_STATE:
+                currentSampleWaterState = handleWaterSampleSetupState();
+                break;
 
-        case SAMPLE_WATER_STATE:
-            currentSampleWaterState = handleWaterSampleState();
-            break;
+            case SAMPLE_WATER_STATE:
+                currentSampleWaterState = handleWaterSampleState();
+                break;
 
-        case SAMPLE_WATER_COMPLETE_STATE:
-            break;
+            case SAMPLE_WATER_COMPLETE_STATE:
+                break;
 
-        default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_SAMPLE_WATER_INVALID_STATE, currentSampleWaterState );
-            break;
+            default:
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_SAMPLE_WATER_INVALID_STATE, currentSampleWaterState );
+                break;
+        }
     }
 }