Index: AlarmDefs.h
===================================================================
diff -u -r87c28967b1b04f37e1a2ddce7b66643650e9291a -r6a6a8e5f0574c4d4a7d48cf6feba3a3cc0e9d3da
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 87c28967b1b04f37e1a2ddce7b66643650e9291a)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 6a6a8e5f0574c4d4a7d48cf6feba3a3cc0e9d3da)
@@ -152,10 +152,10 @@
     ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE = 114,                      ///< HD venous air bubble detector self-test failure
     ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE = 115,                      ///< DG temperature sensor out of range
     ALARM_ID_DG_TEMPERATURE_SENSOR_ADC_OUT_OF_RANGE = 116,                  ///< DG temperature sensor ADC out of range
-    ALARM_ID_DG_PRIMARY_HEATER_INTERNAL_TEMP_OUT_OF_RANGE = 117,            ///< DG primary heater internal temperature out of range
-    ALARM_ID_DG_PRIMARY_HEATER_CJ_TEMP_OUT_OF_RANGE = 118,                  ///< DG primary heater cold junction temperature out of range
-    ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE = 119,            ///< DG trimmer heater internal temperature out of range
-    ALARM_ID_DG_TRIMMER_HEATER_CJ_TEMP_OUT_OF_RANGE = 120,                  ///< DG trimmer heater cold junction temperature out of range
+    ALARM_ID_DG_PRIMARY_HEATER_INTERNAL_TEMP_OUT_OF_RANGE = 117,            ///< DG primary heater internal temperature out of range // TODO remove when DEN-11750 was merged
+    ALARM_ID_DG_PRIMARY_HEATER_CJ_TEMP_OUT_OF_RANGE = 118,                  ///< DG primary heater cold junction temperature out of range // TODO remove when DEN-11750 was merged
+    ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE = 119,            ///< DG trimmer heater internal temperature out of range // TODO remove when DEN-11750 was merged
+    ALARM_ID_DG_TRIMMER_HEATER_CJ_TEMP_OUT_OF_RANGE = 120,                  ///< DG trimmer heater cold junction temperature out of range // TODO remove when DEN-11750 was merged
     ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE = 121,             ///< DG main primary heater voltage out of range
     ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE = 122,            ///< DG small primary heater voltage out of range
     ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE = 123,                  ///< DG trimmer heater voltage out of range
@@ -633,7 +633,7 @@
     { ALARM_PRIORITY_HIGH,   799,  FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_LOAD_CELLS_TARE_WEIGHT_OUT_OF_RANGE,           0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,   799,  FALSE, TRUE , TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE, FALSE, ALARM_ID_DG_LOAD_CELLS_INVALID_CALIBRATION,                0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,   799,  FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_INVALID_LOAD_CELL_VALUE,                       0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UV_REACTOR_NOT_HEALTHY,                           0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,   799,  TRUE,  TRUE,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UV_REACTOR_NOT_HEALTHY,                           0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_LOW,    999,  FALSE, FALSE, FALSE, TRUE,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE,                          0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,   799,  FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CONCENTRATE_PUMP_FAULT,                        0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_CP1_SPEED_CONTROL_ERROR,                          0,              ALARM_ID_NO_ALARM },