Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r81106b694c47757fb36aaf58942b63fa18faec96 -r41b864cbe954522399b3264d50109a3ae0786dfc
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 81106b694c47757fb36aaf58942b63fa18faec96)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 41b864cbe954522399b3264d50109a3ae0786dfc)
@@ -73,6 +73,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).
@@ -673,7 +674,7 @@
         // and setOcclusionInstallLevel has been called.
         if ( MODE_PRET == getCurrentOperationMode() )
         {
-            if ( getPreTreatmentSubState() > HD_PRE_TREATMENT_CART_INSTALL_STATE && getDrySelfTestsState() > DRY_SELF_TESTS_START_STATE )
+            if( getPreTreatmentSubState() > HD_PRE_TREATMENT_CART_INSTALL_STATE && getDrySelfTestsState() > DRY_SELF_TESTS_START_STATE )
             {
                 // Check for occlusion
                 if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
@@ -683,7 +684,6 @@
                 }
             }
         }
-
         // Check for occlusion in Treatment modes where pumps are moving
         else if ( MODE_TREA == getCurrentOperationMode() )
         {
Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -re17b69feca6dce5a8d01c23306770b12485731fe -r41b864cbe954522399b3264d50109a3ae0786dfc
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision e17b69feca6dce5a8d01c23306770b12485731fe)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 41b864cbe954522399b3264d50109a3ae0786dfc)
@@ -180,6 +180,8 @@
     SW_FAULT_ID_HD_AIR_PUMP_INVALID_MOTOR_STATE_SELECTED,
     SW_FAULT_ID_NVDATA_MANAGEMENT_OPS_TIMEOUT,                          // 150
     SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE,
+    SW_FAULT_ID_HD_AIR_PUMP_INVALID_STATE,
+    SW_FAULT_ID_HD_AIR_PUMP_INVALID_MOTOR_STATE_SELECTED,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;
 
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -re17b69feca6dce5a8d01c23306770b12485731fe -r41b864cbe954522399b3264d50109a3ae0786dfc
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e17b69feca6dce5a8d01c23306770b12485731fe)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 41b864cbe954522399b3264d50109a3ae0786dfc)
@@ -5251,6 +5251,7 @@
     if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+
         if ( FALSE == payload.reset )
         {
             result = testSetBatteryRemainingPercentOverride( payload.state.f32 );