Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r874d279bf969199988c7ab6ca2891eec6a6c1bb0 -r1406dcedbc65edd2c134cf2e0861bb5aa2e569da
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 874d279bf969199988c7ab6ca2891eec6a6c1bb0)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 1406dcedbc65edd2c134cf2e0861bb5aa2e569da)
@@ -550,7 +550,7 @@
 
 /*********************************************************************//**
  * @brief
- * The handlePrimeSalineSetupState function checks user's request to start
+ * The handlePrimeWaitForUserStartState function checks user's request to start
  * priming.
  * @details Inputs: primeStartReqReceived
  * @details Outputs: control valves to purge air
@@ -562,6 +562,8 @@
 
     // Keep updating start time until the user requested priming
     primeStartTime = getMSTimerCount();
+    signalAllowDGFillRes1();
+    signalAllowDGFillRes2();
 
 #ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
@@ -605,6 +607,7 @@
     purgeAirValvesBloodPumpControl();
     purgeAirTimeOutStartTime = getMSTimerCount();
     primeSalineDialyzerBubbleClearStartTime = getMSTimerCount();
+
     if ( getTestConfigStatus( TEST_CONFIG_USE_WET_CARTRIDGE ) != TRUE )
     {
         primeDialyzerBubbleClearState = PRIME_BUBBLE_CLEAR_READY_STATE;
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r791b25bd20e80fce8c5d7e8a3ac37d8395f2315c -r1406dcedbc65edd2c134cf2e0861bb5aa2e569da
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 791b25bd20e80fce8c5d7e8a3ac37d8395f2315c)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 1406dcedbc65edd2c134cf2e0861bb5aa2e569da)
@@ -954,8 +954,6 @@
         {
             setOcclusionInstallLevel();  // Record occlusion pressure level after a new cartridge is installed
             doorClosedRequired( TRUE, TRUE );
-            signalAllowDGFillRes1();
-            signalAllowDGFillRes2();
             state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
         }
     }
@@ -1467,19 +1465,6 @@
         setupForSelfTestsStop();
     }
 
-#ifndef _RELEASE_
-    if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) ) ||  // Allow res 1&2 fills now if air pump not disabled
-         ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) ) )
-    {
-        if ( state != DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE )
-        {
-            signalAllowDGFlushFills();
-            signalAllowDGFillRes1();
-            signalAllowDGFillRes2();
-        }
-    }
-#endif
-
     return state;
 }