Index: firmware/App/Controllers/DGInterface.h
===================================================================
diff -u -rde22eef34c821f425e864f8dea32f61cd2141fb4 -r4f89cf6acdca1a537cd9d9bd851dc9dc7cf5c63a
--- firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision de22eef34c821f425e864f8dea32f61cd2141fb4)
+++ firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision 4f89cf6acdca1a537cd9d9bd851dc9dc7cf5c63a)
@@ -118,6 +118,7 @@
 F32 getHeatDisinfectTemperatureSensorValue( void );
 BOOL getTrimmerHeaterCommandedOn( void );
 DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void );
+F32 getDialysateTemperature( void );
 DG_MIXING_RATIOS_T getDGMixingRatios( void );
 void getHDVersionDGServiceAndUsageData( DG_SERVICE_AND_USAGE_DATA_T* data );
 
Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r8b5b59032b8edc0db91041b35dabc0a81f96ea04 -r4f89cf6acdca1a537cd9d9bd851dc9dc7cf5c63a
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 8b5b59032b8edc0db91041b35dabc0a81f96ea04)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 4f89cf6acdca1a537cd9d9bd851dc9dc7cf5c63a)
@@ -166,10 +166,12 @@
 #define SYRINGE_PUMP_STALL_SPEED_THRESHOLD            0.05F                                 ///< Minimum syringe pump speed to be considered not stalled.
 
 #define SYRINGE_PUMP_ADC_FPGA_ERROR_TIMEOUT_MS        ( 2 * MS_PER_SECOND )                 ///< Syringe pump ADC FPGA error timeout in milliseconds.
+
 #define SYRINGE_PUMP_DAC_MAX_RETRIES                  5                                     ///< Syringe pump DAC retries to write.
 #define SYRINGE_PUMP_DAC_TIMER                        ( 200 / TASK_PRIORITY_INTERVAL )      ///< Syringe pump DAC timer between retries.
 #define SYRINGE_PUMP_OCCLUSION_PERSISTENCE            50                                    ///< Syringe pump occlusion persistence timer in milliseconds.
 #define SYRINGE_PUMP_EMPTY_FORCE_COUNT                5                                     ///< Syringe pump empty force voltage count persistence.
+
 /// Defined states for the syringe pump control state machine.
 typedef enum SyringePump_States
 {
@@ -349,6 +351,7 @@
     initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_CONTROLLER_DIRECTION_ERROR, 0, SYRINGE_PUMP_DIR_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_RUNNING_WHILE_BP_OFF_ERROR, 0, SYRINGE_PUMP_OFF_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR, 0, SYRINGE_PUMP_RATE_ALARM_PERSISTENCE );
+    initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION, 0, SYRINGE_PUMP_OCCLUSION_PERSISTENCE);
     initTimeWindowedCount( TIME_WINDOWED_COUNT_SYRINGE_PUMP_OFF_ERROR, SYRINGE_PUMP_OFF_ERROR_MAX_CNT, SYRINGE_PUMP_OFF_ERROR_TIME_WIN_MS );
 
     initFPGAPersistentAlarm( FPGA_PERS_ERROR_SYRINGE_PUMP_ADC, ALARM_ID_HD_SYRINGE_PUMP_FPGA_ADC_FAULT,
Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -rde22eef34c821f425e864f8dea32f61cd2141fb4 -r4f89cf6acdca1a537cd9d9bd851dc9dc7cf5c63a
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision de22eef34c821f425e864f8dea32f61cd2141fb4)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 4f89cf6acdca1a537cd9d9bd851dc9dc7cf5c63a)
@@ -887,7 +887,6 @@
         // Reset bolus data before we start
         bolusSalineVolumeDelivered_mL = 0.0;
         bolusSalineLastVolumeTimeStamp = getMSTimerCount();
-
         // Bypass dialyzer
         setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
         setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r2112778f4de1b5bac8df9915da1ab2def967a9cf -r4f89cf6acdca1a537cd9d9bd851dc9dc7cf5c63a
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 2112778f4de1b5bac8df9915da1ab2def967a9cf)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 4f89cf6acdca1a537cd9d9bd851dc9dc7cf5c63a)
@@ -5529,6 +5529,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 -rd9e5244f8f1da1f42e87f9c5ab8bdad728805a7e -r4f89cf6acdca1a537cd9d9bd851dc9dc7cf5c63a
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision d9e5244f8f1da1f42e87f9c5ab8bdad728805a7e)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 4f89cf6acdca1a537cd9d9bd851dc9dc7cf5c63a)
@@ -944,9 +944,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 );
 
Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -rde22eef34c821f425e864f8dea32f61cd2141fb4 -r4f89cf6acdca1a537cd9d9bd851dc9dc7cf5c63a
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision de22eef34c821f425e864f8dea32f61cd2141fb4)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 4f89cf6acdca1a537cd9d9bd851dc9dc7cf5c63a)
@@ -185,7 +185,7 @@
             {
                 F32 v24 = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS );
                 F32 audioCurrent = getFPGABackupAlarmAudioCurrent();
-
+
                 // Verify 24V is down when w.d. expired
                 if ( v24 > MAX_24V_LEVEL_ON_WATCHDOG_EXPIRED )
                 {