Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r5d9c5362b537331248dc592e05b6b016267eb6d3 -r8f0292d944c1796f8f246bec5692a9b295be3ac2
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 5d9c5362b537331248dc592e05b6b016267eb6d3)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 8f0292d944c1796f8f246bec5692a9b295be3ac2)
@@ -885,6 +885,19 @@
         requestNewOperationMode( MODE_TREA );
     }
 
+    if ( TRUE == doesAlarmStatusIndicateStop() )
+    {
+        signalDialInPumpHardStop();
+        cmdStopDGTrimmerHeater();
+    }
+    else if ( TRUE == alarmActionResumeReceived )
+    {
+        alarmActionResumeReceived = FALSE;
+        //setDialInPumpTargetFlowRate( DIP_PATIENT_CONNECTION_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+        setDialInPumpTargetFlowRate( 250, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP ); // TODO remove this line once the new flow control is implemented
+        cmdStartDGTrimmerHeater();
+    }
+
     return HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE;
 }
 
Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r39156e21acec61d20fa49ee0adfffedf0f8597d9 -r8f0292d944c1796f8f246bec5692a9b295be3ac2
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 39156e21acec61d20fa49ee0adfffedf0f8597d9)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 8f0292d944c1796f8f246bec5692a9b295be3ac2)
@@ -390,9 +390,12 @@
  *************************************************************************/
 static void setupForPrimePause( void )
 {
+    setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
+    setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
     signalDialOutPumpHardStop();
     signalDialInPumpHardStop();
     signalBloodPumpHardStop();
+    stopSyringePump();
 
     primePauseStartTime = getMSTimerCount();
     previousPrimeState  = currentPrimeState;