Index: firmware/App/Modes/SampleWater.c
===================================================================
diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r27a68f930508638f2eb6265ebb381c8918cbc37b
--- firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c)
+++ firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 27a68f930508638f2eb6265ebb381c8918cbc37b)
@@ -7,8 +7,8 @@
 *
 * @file    SampleWater.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      22-Feb-2022
+* @author  (last)      Darren Cox
+* @date    (last)      10-Mar-2022
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  19-Feb-2021
@@ -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;
+        }
     }
 }
 
@@ -129,10 +138,12 @@
 {
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_FAILED;
 
+#ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) )
     {
         sampleWaterResult = TRUE;
     }
+#endif
 
     if ( TRUE == sampleWaterResult )
     {