Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r61716bc97ecca8af1ec560333844a8cf602eccb0 -r40f46e196349e3dd730048a354df8bbb2e40407d
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 61716bc97ecca8af1ec560333844a8cf602eccb0)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 40f46e196349e3dd730048a354df8bbb2e40407d)
@@ -199,7 +199,10 @@
     {
         case HD_PRE_TREATMENT_START_STATE:
 #ifndef SKIP_SAMPLE_WATER
-            transitionToSampleWater();
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) != SW_CONFIG_ENABLE_VALUE )
+            {
+                transitionToSampleWater();
+            }
 #endif
             currentPreTreatmentState = HD_PRE_TREATMENT_WATER_SAMPLE_STATE;
             break;
@@ -354,7 +357,10 @@
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NO_PATIENT_CONNECTION_CONFIRM;
 
 #ifdef SKIP_UI_INTERACTION
-    patientConnectionConfirm = TRUE;
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
+    {
+        patientConnectionConfirm = TRUE;
+    }
 #endif
 
     if ( TRUE == patientConnectionConfirm )
@@ -542,7 +548,8 @@
     execSampleWater();
 
 #ifndef SKIP_SAMPLE_WATER
-    if ( SAMPLE_WATER_COMPLETE_STATE == getSampleWaterState() )
+    if ( ( SAMPLE_WATER_COMPLETE_STATE == getSampleWaterState() ) ||
+         ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) != SW_CONFIG_ENABLE_VALUE ) )
 #endif
     {
         cmdDGSampleWater( SAMPLE_WATER_CMD_END );
@@ -647,7 +654,10 @@
     HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_CART_INSTALL_STATE;
 
 #ifdef SKIP_UI_INTERACTION
-    confirmInstallRequested = TRUE;
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
+    {
+        confirmInstallRequested = TRUE;
+    }
 #endif
 
     if ( TRUE == confirmInstallRequested )
@@ -763,7 +773,10 @@
     execPreTreatmentRecirc();
 
 #ifdef SKIP_UI_INTERACTION
-    continueToTreatmentRequested = TRUE;
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
+    {
+        continueToTreatmentRequested = TRUE;
+    }
 #endif
 
     if ( TRUE == continueToTreatmentRequested )