Index: AlarmDefs.h
===================================================================
diff -u -rd1cac904e12deecc447bef13a28fd9090ea8c72e -rce9a12a2aa16ccd55f2e4a00d5dd980764359361
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision d1cac904e12deecc447bef13a28fd9090ea8c72e)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision ce9a12a2aa16ccd55f2e4a00d5dd980764359361)
@@ -179,7 +179,7 @@
     ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT = 141,                          ///< Air trap fill timeout during treatment
     ALARM_ID_OCCLUSION_BLOOD_PUMP = 142,                                    ///< Blood pump occlusion detected
     ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE = 143,           ///< DG dialysate temperature sensors out of range
-    ALARM_ID_DG_SW_CONFIG_RECORD_INVALID_CRC = 144,                         ///< DG software configuration record invalid CRC.
+    ALARM_ID_DG_SW_CONFIG_RECORD_INVALID_CRC = 144,    // TODO remove when DEN-12224 merged                     ///< DG software configuration record invalid CRC.
     ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE = 145,                          ///< Concentrate conductivity after adding acid out of range alarm
     ALARM_ID_DG_RTC_OR_TIMER_ACCURACY_FAILURE = 146,                        ///< DG RTC or timer accuracy failure.
     ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT = 147,                          ///< Wait for the DG to produce dialysate
@@ -190,7 +190,7 @@
     ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE = 152,                       ///< Inlet water pressure in low range
     ALARM_ID_PRIME_COMPLETED_HIGH = 153,                                    ///< HD prime completed high priority alarm
     ALARM_ID_NVDATA_EEPROM_OPS_FAILURE = 154,                               ///< EEPROM operations (read, write, erase) failure
-    ALARM_ID_HD_SW_CONFIG_RECORD_INVALID_CRC = 155,                         ///< DG software configuration record invalid CRC
+    ALARM_ID_HD_SW_CONFIG_RECORD_INVALID_CRC = 155,    // TODO remove when DEN-12224 merged                     ///< DG software configuration record invalid CRC
     ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR = 156,                          ///< HW usage data (treatment time in HD and total consumed water in DG) failure
     ALARM_ID_DG_CHEM_DISINFECT_PRIME_ACID_LINE_TIME_OUT = 157,              ///< DG chemical disinfect prime acid line timeout.
     ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE = 158,                    ///< Inlet water temperature is in the low range