Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -rf013ac5e5de456c4fa4367884cda6515f2a51642 -r9e85e7ace1390d48587174a5bc6eb11d5185cea4
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision f013ac5e5de456c4fa4367884cda6515f2a51642)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 9e85e7ace1390d48587174a5bc6eb11d5185cea4)
@@ -186,6 +186,14 @@
 #else
             currentPrimeState = HD_PRIME_WAIT_FOR_USER_START_STATE;
 #endif
+            if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) )
+            {
+                currentPrimeState = HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE;
+            }
+            else
+            {
+                currentPrimeState = HD_PRIME_WAIT_FOR_USER_START_STATE;
+            }
             break;
 
         case HD_PRIME_WAIT_FOR_USER_START_STATE:
@@ -424,11 +432,14 @@
     primeStartTime = getMSTimerCount();
 
 #ifdef SKIP_UI_INTERACTION
+    primeStartRequested = TRUE;
+#endif
+
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
     {
         primeStartRequested = TRUE;
     }
-#endif
+
     if ( TRUE == primeStartRequested )
     {
         primeStartRequested = FALSE;
@@ -582,8 +593,16 @@
     #ifdef SKIP_PRIMING
             state = HD_PRIME_WET_SELF_TESTS_STATE;
     #else
-            state = HD_PRIME_DIALYSATE_DIALYZER_STATE;
+            //state = HD_PRIME_DIALYSATE_DIALYZER_STATE;
     #endif
+            if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) )
+            {
+                state = HD_PRIME_WET_SELF_TESTS_STATE;
+            }
+            else
+            {
+                state = HD_PRIME_DIALYSATE_DIALYZER_STATE;
+            }
         }
     }
 
@@ -828,11 +847,17 @@
     }
 
 #ifndef SKIP_WET_SELF_TESTS
-    execWetSelfTests();
+    //execWetSelfTests();
 
-    if ( TRUE == isWetSelfTestsPassed() )
+    //if ( TRUE == isWetSelfTestsPassed() )
 #endif
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE )
     {
+        execWetSelfTests();
+    }
+
+    if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) ) || ( TRUE == isWetSelfTestsPassed() ) )
+    {
         state = HD_PRIME_COMPLETE;
     }