Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r56a29edb597683fdf83c87ae46af3d2dcdf0e834 -r7afa4685f396a17441462b2a57043b247f0394e1
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 56a29edb597683fdf83c87ae46af3d2dcdf0e834)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 7afa4685f396a17441462b2a57043b247f0394e1)
@@ -165,6 +165,19 @@
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
 
+    // Pumps should be off
+    signalBloodPumpHardStop();
+    signalDialInPumpHardStop();
+    signalDialOutPumpHardStop();
+    stopSyringePump();
+
+    // Set valves to default positions
+    setValveAirTrap( STATE_CLOSED );
+    setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
+    setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
+    setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
+    setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
+
     resetPrimeFlags();
 }
 
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r22dc8daefbb24bd2a2ea6f0a2465c6714267638c -r7afa4685f396a17441462b2a57043b247f0394e1
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 22dc8daefbb24bd2a2ea6f0a2465c6714267638c)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 7afa4685f396a17441462b2a57043b247f0394e1)
@@ -591,7 +591,7 @@
     TREATMENT_RESERVOIR_MGMT_STATE_T state = TREATMENT_RESERVOIR_MGMT_WAIT_FOR_FILL_SETTLE_STATE;
 
     // Wait for the reservoir to settle and then send the commands to switch the active reservoir
-    if ( ( TRUE == didTimeout( reservoirSwitchStartTimeMS, RESERVOIR_SETTLE_TIME_MS ) ) &&
+    if ( ( TRUE == didTimeout( reservoirSwitchStartTimeMS, 15000 /*RESERVOIR_SETTLE_TIME_MS*/ ) ) &&
          ( dilutionLevelPct >= MAX_RESERVOIR_DILUTION ) || ( volSpentML >= (F32)FILL_RESERVOIR_TO_VOLUME_ML ) )
     {
         DG_RESERVOIR_ID_T inactiveRes = getDGInactiveReservoir();