Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r95b275466588d40625b0fbb2e8a6034f95940e14 -r6cdabf7f2032e8adbec0763f24fb9e26ffe668ff
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 95b275466588d40625b0fbb2e8a6034f95940e14)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 6cdabf7f2032e8adbec0763f24fb9e26ffe668ff)
@@ -90,6 +90,7 @@
 
 #define PSI_TO_MMHG                         ( 51.7149F )                                    ///< Conversion factor for converting PSI to mmHg.
 
+// The new arterial pressure sensor is the same as the venous pressure sensor
 #define VENOUS_PRESSURE_NORMAL_OP           0                                               ///< Venous pressure status bits indicate normal operation.
 #define VENOUS_PRESSURE_CMD_MODE            1                                               ///< Venous pressure status bits indicate sensor in command mode.
 #define VENOUS_PRESSURE_STALE_DATA          2                                               ///< Venous pressure status bits indicate data is stale (no new data since last fpga read).
@@ -1085,7 +1086,6 @@
                 }
             }
         }
-
         // Check for occlusion in Treatment modes where pumps are moving
         else if ( MODE_TREA == hdMode )
         {
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r8436bb33a488e4471ad8c9d66bdbfcf50589f25b -r6cdabf7f2032e8adbec0763f24fb9e26ffe668ff
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 8436bb33a488e4471ad8c9d66bdbfcf50589f25b)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 6cdabf7f2032e8adbec0763f24fb9e26ffe668ff)
@@ -28,6 +28,7 @@
 #include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "PersistentAlarm.h"
+#include "PresOccl.h"
 #include "Reservoirs.h"
 #include "Rinseback.h"
 #include "RTC.h"
@@ -752,6 +753,8 @@
                 sendTreatmentLogEventData( UF_START_RESUME_EVENT, 0.0, presUFRate );
             }
             transitionToDialysis();
+            // To update partial blood pump occlusion baseline - start of treatment
+            signalBloodPumpPressureOcclBaseline();
             result = TREATMENT_DIALYSIS_STATE;
         }
     }
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rf10e393f3d4c017d7e6f252b6ee203042ea5ee67 -r6cdabf7f2032e8adbec0763f24fb9e26ffe668ff
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f10e393f3d4c017d7e6f252b6ee203042ea5ee67)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6cdabf7f2032e8adbec0763f24fb9e26ffe668ff)
@@ -5713,6 +5713,7 @@
     if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+
         if ( FALSE == payload.reset )
         {
             result = testSetBatteryRemainingCapacityOverride( payload.state.f32 );
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rf10e393f3d4c017d7e6f252b6ee203042ea5ee67 -r6cdabf7f2032e8adbec0763f24fb9e26ffe668ff
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision f10e393f3d4c017d7e6f252b6ee203042ea5ee67)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 6cdabf7f2032e8adbec0763f24fb9e26ffe668ff)
@@ -946,9 +946,6 @@
 // MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE
 BOOL sendBloodLeakEmbeddedModeCommandResponse( U08 cmd, U32 responseLen, U08* response );
 
-// MSG_ID_HD_SEND_ALARMS_COMMAND
-void handleResendAllAlarmsCommand(  MESSAGE_T* message );
-
 // MSG_ID_HD_BLOOD_PUMP_SET_PWM
 void handleTestBloodPumpSetPWM( MESSAGE_T* message );