Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r9051b47d2d0e9f112d4ebc310a5572844b7528f4 -rad4d98e7d69ee6320a7ab573c353cd6ff92a76fe
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 9051b47d2d0e9f112d4ebc310a5572844b7528f4)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision ad4d98e7d69ee6320a7ab573c353cd6ff92a76fe)
@@ -162,12 +162,13 @@
     SW_FAULT_ID_HD_INVALID_SWITCH_ID,
     SW_FAULT_ID_SAFETY_SHUTDOWN_INVALID_SELF_TEST_STATE,
     SW_FAULT_ID_PHANTOM_INTERRUPT,
-    SW_FAULT_ID_UNEXPECTED_DMA_INTERRUPT,                               // 130
-    SW_FAULT_ID_INVALID_TREATMENT_RESERVOIR_MANAGEMENT_STATE,
+    SW_FAULT_ID_UNEXPECTED_DMA_INTERRUPT,
+    SW_FAULT_ID_INVALID_TREATMENT_RESERVOIR_MANAGEMENT_STATE,           // 135
     SW_FAULT_ID_MODE_TREATMENT_PARAMS_INVALID_GET_S32_PARAM_MIN_LIMIT,
     SW_FAULT_ID_MODE_TREATMENT_PARAMS_INVALID_GET_S32_PARAM_MAX_LIMIT,
     SW_FAULT_ID_ILLEGAL_MEM_ACCESS,
     SW_FAULT_ID_DG_INVALID_FILL_COMMAND_REJECTED,
+    SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT,                               // 140
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;
 
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r5b448e81db260e5b041699a83c6f2a3faa260ea9 -rad4d98e7d69ee6320a7ab573c353cd6ff92a76fe
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 5b448e81db260e5b041699a83c6f2a3faa260ea9)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision ad4d98e7d69ee6320a7ab573c353cd6ff92a76fe)
@@ -168,10 +168,8 @@
     checkReservoirMaxVolume();
     calculateActiveReservoirCycleTime();
 
-    // TODO do we need this? Should we not call the reservoir management exec function in saline bolus?
-
-    // Calculate volume used from active reservoir - do not accumulate if saline bolus is in progress
-    if (  getSalineBolusState() != SALINE_BOLUS_STATE_IN_PROGRESS )
+    // Calculate volume used from active reservoir - do not accumulate if not performing dialysis or saline bolus is in progress
+    if ( ( TREATMENT_DIALYSIS_STATE == getTreatmentState() ) && ( getDialysisState() != DIALYSIS_SALINE_BOLUS_STATE ) )
     {
         volSpentML += ( flowRateMLPerMS * msSinceLastVolumeCalc );
     }