Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rb7d7f9a49fb65b485d7904e94e63df74e4619607 -r8128289dea98878d92bf170fde1c7145f858baa5
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision b7d7f9a49fb65b485d7904e94e63df74e4619607)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 8128289dea98878d92bf170fde1c7145f858baa5)
@@ -178,6 +178,7 @@
 
     if ( FALSE == isBloodPumpRunning() )
     {
+        transitionToPrime();
         state = PRE_TREATMENT_PRIME_STATE;
     }
 
@@ -215,9 +216,7 @@
  *************************************************************************/
 static PRE_TREATMENT_MODE_STATE_T handlePatientConnectionState( void )
 {
-#ifndef DISABLE_UI_TREATMENT_WORKFLOW
     if ( TRUE == treatStartReqReceived )
-#endif
     {
         requestNewOperationMode( MODE_TREA );
     }
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rcc17b25a926126e4f5a6fa3b2a14e431bb3ae84a -r8128289dea98878d92bf170fde1c7145f858baa5
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision cc17b25a926126e4f5a6fa3b2a14e431bb3ae84a)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 8128289dea98878d92bf170fde1c7145f858baa5)
@@ -115,12 +115,7 @@
             break;
 
         case STANDBY_WAIT_FOR_TREATMENT_STATE:
-            // TODO - test code
-#ifdef DISABLE_UI_TREATMENT_WORKFLOW
-            if ( TRUE == stop )
-#else
             if ( TRUE == treatStartReqReceived )
-#endif
             {
                 setStartReservoirVolume();
                 requestNewOperationMode( MODE_TPAR );
Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r7927873fa83b873c58c0ffe8e56a594d24afcabc -r8128289dea98878d92bf170fde1c7145f858baa5
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 7927873fa83b873c58c0ffe8e56a594d24afcabc)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 8128289dea98878d92bf170fde1c7145f858baa5)
@@ -33,7 +33,7 @@
 #define BLOOD_PUMP_FLOW_RATE_PURGE_AIR          100                                                 ///< Blood pump flow rate during prime purge air state.
 #define BLOOD_PUMP_FLOW_RATE_CIRC_BLOOD_CIRCUIT 300                                                 ///< Blood pump flow rate during prime recirculate blood circuit state.
 #define NO_AIR_DETECTED_COUNT                   ( 10 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )      ///< No air detected time period count.
-#define PURGE_AIR_TIME_OUT_COUNT                ( 10 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )      ///< Time period count for purge air time out.
+#define PURGE_AIR_TIME_OUT_COUNT                ( 15 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )      ///< Time period count for purge air time out.
 
 #define PRIME_DRAIN_RESERVOIR_TO_VOLUME_ML      100                                                 ///< Drain reservoir to this volume (in mL) during prime.
 #define PRIME_FILL_RESERVOIR_TO_VOLUME_ML       1700                                                ///< Fill reservoir to this volume (in mL) during prime.
@@ -96,8 +96,10 @@
 void transitionToPrime( void )
 {
     currentPrimeState = PRIME_START_STATE;
+    currentReservoirMgmtState = PRIME_RESERVOIR_MGMT_START_STATE;
     isPrimeCompleted = FALSE;
-    primeStartReqReceived = FALSE;
+    // TODO: set to false after integration with UI
+    primeStartReqReceived = TRUE;
     purgeAirTimeOutTimerCount = 0;
 
     reservoirFilledStatus[ DG_RESERVOIR_1 ] = FALSE;
@@ -279,9 +281,7 @@
 {
     PRE_TREATMENT_PRIME_STATE_T state = PRIME_SALINE_SETUP_STATE;
 
-#ifndef DISABLE_UI_TREATMENT_WORKFLOW
     if ( TRUE == primeStartReqReceived )
-#endif
     {
         purgeAirValvesBloodPumpControl();
         purgeAirTimeOutTimerCount = 0;