Index: firmware/App/Controllers/DGInterface.h
===================================================================
diff -u -r92d44791a1751359f188c883b876261aed985942 -rf5f37b1e2865bc495f11bc2d6532c15059ae2f37
--- firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision 92d44791a1751359f188c883b876261aed985942)
+++ firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision f5f37b1e2865bc495f11bc2d6532c15059ae2f37)
@@ -119,6 +119,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 -rac49c8fce6fdc1fe2a1b01eb97f1478642e41b84 -rf5f37b1e2865bc495f11bc2d6532c15059ae2f37
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision ac49c8fce6fdc1fe2a1b01eb97f1478642e41b84)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision f5f37b1e2865bc495f11bc2d6532c15059ae2f37)
@@ -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 -r79cd16f091997683de89e2e84d3a86e2dd7d5493 -rf5f37b1e2865bc495f11bc2d6532c15059ae2f37
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 79cd16f091997683de89e2e84d3a86e2dd7d5493)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision f5f37b1e2865bc495f11bc2d6532c15059ae2f37)
@@ -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/AlarmMgmt.c
===================================================================
diff -u -r72598f0fb0dc610f0dc8d624f0737f951ce6ac56 -rf5f37b1e2865bc495f11bc2d6532c15059ae2f37
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 72598f0fb0dc610f0dc8d624f0737f951ce6ac56)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision f5f37b1e2865bc495f11bc2d6532c15059ae2f37)
@@ -254,6 +254,33 @@
 
 /*********************************************************************//**
  * @brief
+ * The isACPowerLost function determines whether A/C power loss has
+ * been detected. This function sets the alarms blocked condition to
+ * allow smooth alarm recovery.
+ *
+ * @details Inputs: alarmStatus
+ * @details Outputs: alarmsBlockedTimer
+ * @return TRUE if A/C power loss alarm is in effect, FALSE if not
+ *************************************************************************/
+BOOL isACPowerLost( void )
+{
+    BOOL result = TRUE;
+
+    // Continue to block new alarms until the alarms are cleared.
+    if ( ( FALSE == isAlarmConditionDetected( ALARM_ID_HD_AC_POWER_LOST ) ) &&
+         ( FALSE == isAlarmConditionDetected( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT ) ) )
+    {
+        result = FALSE;
+    }
+    else
+    {
+        alarmsBlockedTimer = ALARM_BLOCKED_COUNT_AFTER_AC_RETURN;
+    }
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The activateAlarm function activates a given alarm.
  * @details Inputs: none
  * @details Outputs: alarmIsActive[], alarmStartedAt[], alarmStatus is updated
@@ -262,6 +289,11 @@
  *************************************************************************/
 static void activateAlarm( ALARM_ID_T alarm )
 {
+    // Block new alarms, occuring during loss of AC power
+    if ( ( TRUE == getCPLDACPowerLossDetected() ) )
+    {
+        alarmsBlockedTimer = ALARM_BLOCKED_COUNT_AFTER_AC_RETURN;
+    }
     // Verify valid alarm index
     if ( ( alarm > ALARM_ID_NO_ALARM ) && ( alarm < NUM_OF_ALARM_IDS ) )
     {