Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r41eaf78372c0ee2a79b38d0a06bd3f02d54baed4 -r8c6a692af6ef8136e84e8a4fb189b014bd1711e7
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 41eaf78372c0ee2a79b38d0a06bd3f02d54baed4)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 8c6a692af6ef8136e84e8a4fb189b014bd1711e7)
@@ -1472,7 +1472,7 @@
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ULTRAFILTRATION_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
         {
-            SET_ALARM_WITH_1_F32_DATA( ALARM_ID_UF_RATE_TOO_HIGH_ERROR, uFMeasRate );
+            SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_UF_RATE_ERROR, uFMeasRate );
         }
     }
     SEND_EVENT_WITH_2_F32_DATA( HD_EVENT_RSRVR_UF_VOLUME_AND_TIME, uFResVolumeInMl, resUFTimeInMin )
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rc28337436dce61c9ecc295d191c44628e089bf33 -r8c6a692af6ef8136e84e8a4fb189b014bd1711e7
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision c28337436dce61c9ecc295d191c44628e089bf33)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 8c6a692af6ef8136e84e8a4fb189b014bd1711e7)
@@ -144,7 +144,6 @@
 static void setAlarmLamp( void );
 static void setAlarmAudio( void );
 static void updateAlarmsSilenceStatus( void );
-static void handleAlarmEscalations( void );
 static void updateAlarmsFlags( void );
 
 static void clearAllRecoverableAlarms( void );
@@ -197,7 +196,8 @@
     alarmStatus.alarmsSilenced = FALSE;
     alarmStatus.alarmsSilenceStart = 0;
     alarmStatus.alarmsSilenceExpiresIn = 0;
-    alarmStatus.alarmsEscalatesIn = 0;
+    alarmStatus.alarmsEscalatesIn = 0;
+    alarmStatus.alarmsToEscalate = FALSE;
     alarmStatus.alarmTop = ALARM_ID_NO_ALARM;
     alarmStatus.topAlarmConditionDetected = FALSE;
     alarmStatus.systemFault = FALSE;
@@ -228,7 +228,6 @@
 void execAlarmMgmt( void )
 {
     monitorAlarms();
-    handleAlarmEscalations();
     updateAlarmsState();
     updateAlarmsFlags();
     updateAlarmsSilenceStatus();
@@ -1078,70 +1077,9 @@
         }
     }
 }
-
+
 /*********************************************************************//**
  * @brief
- * The handleAlarmEscalations function handles alarm escalation.
- * @details Inputs: alarmIsActive[], ALARM_TABLE[]
- * @details Outputs: alarm(s) escalated when appropriate
- * @return none
- *************************************************************************/
-static void handleAlarmEscalations( void )
-{
-    U32 secsToEscalate = 0;
-    ALARM_ID_T nextAlarmToEscalate = ALARM_ID_NO_ALARM;
-    ALARM_ID_T a;
-
-    // Update escalations
-    for ( a = ALARM_ID_NO_ALARM; a < NUM_OF_ALARM_IDS; a++ )
-    {
-        if ( TRUE == alarmIsActive[ a ] )
-        {
-            // Does active alarm escalate?
-            if ( ALARM_ID_NO_ALARM != ALARM_TABLE[ a ].alarmEscalatesTo )
-            {
-                S32 msRemaining = (S32)ALARM_TABLE[ a ].alarmEscalatesAfter - (S32)calcTimeSince( getAlarmStartTime( a ) );
-                S32 secsRemaining = ( msRemaining / MS_PER_SECOND ) + 1;
-
-                // Time to escalate?
-                if ( msRemaining <= 0 )
-                {
-                    activateAlarmNoData( ALARM_TABLE[ a ].alarmEscalatesTo );
-                    clearAlarm( a );
-                }
-                else
-                {   // No candidates for alarm escalation yet?
-                    if ( ALARM_ID_NO_ALARM == nextAlarmToEscalate )
-                    {
-                        secsToEscalate = secsRemaining;
-                        nextAlarmToEscalate = a;
-                    }
-                    // Sooner candidate for alarm escalation?
-                    else if ( secsRemaining < secsToEscalate )
-                    {
-                        secsToEscalate = secsRemaining;
-                        nextAlarmToEscalate = a;
-                    }
-                }
-            } // If alarm escalates
-        } // If alarm active
-    } // Alarm table loop
-
-    // Update alarm escalation properties
-    if ( TRUE == alarmStatus.systemFault || ALARM_ID_NO_ALARM == nextAlarmToEscalate )
-    {
-        alarmStatus.alarmsToEscalate = FALSE;
-        alarmStatus.alarmsEscalatesIn = 0;
-    }
-    else
-    {
-        alarmStatus.alarmsToEscalate = TRUE;
-        alarmStatus.alarmsEscalatesIn = secsToEscalate;
-    }
-}
-
-/*********************************************************************//**
- * @brief
  * The updateAlarmsFlags function updates the alarms flags of the alarms
  * status record.
  * @details Inputs: alarmStatus, alarmIsActive, ALARM_TABLE, alarmButtonBlockers