Index: firmware/App/Modes/BloodPrime.c
===================================================================
diff -u -rc1b9ac0dbf2196280895d2e440dd7ac288ac8424 -r8747e947a7bc52dc3a4fb1346935740e08f5e974
--- firmware/App/Modes/BloodPrime.c	(.../BloodPrime.c)	(revision c1b9ac0dbf2196280895d2e440dd7ac288ac8424)
+++ firmware/App/Modes/BloodPrime.c	(.../BloodPrime.c)	(revision 8747e947a7bc52dc3a4fb1346935740e08f5e974)
@@ -7,8 +7,8 @@
 *
 * @file    BloodPrime.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      12-Apr-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      15-May-2023
 *
 * @author  (original)  Sean Nash
 * @date    (original)  06-Feb-2021
@@ -139,6 +139,7 @@
     setBloodPumpTargetFlowRate( (U32)bloodPrimeRampFlowRate_mL_min, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
     setDialInPumpTargetFlowRate( DIALYSATE_FLOW_RATE_FOR_RECIRC, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
     cmdStartDGTrimmerHeater();
+    setCurrentSubState( NO_SUB_STATE );
 
     // Start air trap control
     startAirTrapControl();
@@ -223,6 +224,12 @@
     // Update blood prime volume delivered so far
     cumulativeBloodPrimeVolume_mL.data += ( getMeasuredBloodFlowRate() * BLOOD_PRIME_FLOW_INTEGRATOR );
 
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_SKIP_BLOOD_PRIME ) )
+    {
+        // If the skip blood prime is enabled, set the cumulative volume to the target blood prime volume
+        cumulativeBloodPrimeVolume_mL.data = bloodPrimeTargetVolume_mL;
+    }
+
     // Has blood prime completed?
     if ( getBloodPrimeVolume() >= bloodPrimeTargetVolume_mL )
     {