Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r61716bc97ecca8af1ec560333844a8cf602eccb0 -rf013ac5e5de456c4fa4367884cda6515f2a51642
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 61716bc97ecca8af1ec560333844a8cf602eccb0)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision f013ac5e5de456c4fa4367884cda6515f2a51642)
@@ -56,9 +56,6 @@
 #define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML      FILL_RESERVOIR_TO_VOLUME_ML
 #endif
 
-#define PRIMARY_HEATER_TARGET_TEMP_OFFSET               2.0  //TODO remove           ///< Primary heater target temperature offset from trimmer heater temperature.
-
-
 /// States of the pre-treatment reservoir management state machine.
 typedef enum PreTreatmentReservoirMgmt_States
 {
@@ -199,7 +196,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;
@@ -273,6 +273,7 @@
     {
         confirmInstallRequested = TRUE;
     }
+    // TODO - send a reject reason if not accepting confirmation
 }
 
 /*********************************************************************//**
@@ -354,7 +355,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 +546,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 )*/ ) // DEBUG_DENALI
 #endif
     {
         cmdDGSampleWater( SAMPLE_WATER_CMD_END );
@@ -647,7 +652,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 +771,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 )
@@ -1035,7 +1046,15 @@
             if ( FALSE == reservoirFlushedStatus[ DG_RESERVOIR_1 ] )
             {
 #ifdef SKIP_PRIMING
-                reservoirFilledStatus[ DG_RESERVOIR_1 ] = TRUE;
+                if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) )
+                {
+                    reservoirFilledStatus[ DG_RESERVOIR_1 ] = TRUE;
+                }
+                else
+                {
+                    reservoirFlushedStatus[ DG_RESERVOIR_1 ] = TRUE;
+                    cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
+                }
 #else
                 reservoirFlushedStatus[ DG_RESERVOIR_1 ] = TRUE;
                 cmdSetDGActiveReservoir( DG_RESERVOIR_1 );