Index: AlarmDefs.h
===================================================================
diff -u -ra4d8988757c6b50b83de8accb642ac0d42574f11 -r48ce983b0a0a8e3aa6bd54f480fb55c9019d2f4e
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision a4d8988757c6b50b83de8accb642ac0d42574f11)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 48ce983b0a0a8e3aa6bd54f480fb55c9019d2f4e)
@@ -243,7 +243,7 @@
     ALARM_ID_CONDUCTIVITY_SENSOR_FAULT = 205,                               ///< Conductivity sensor fault
     ALARM_ID_DG_DIALYSATE_FILL_OUT_OF_TIME = 206,                           ///< DG dialysate fill runs out of time
     ALARM_ID_DG_FLOW_METER_CHECK_FAILURE = 207,                             ///< DG flow meter check failure alarm
-    ALARM_ID_DG_PRIMARY_HEATER_ON_WITH_NO_FLOW_TIMEOUT = 208,               ///< DG primary heater on with no flow time out
+    ALARM_ID_DG_PRIMARY_HEATER_ON_WITH_NO_FLOW_TIMEOUT = 208,               ///< DG primary heater on with no flow time out // TODO remove when DEN-12224 was merged
     ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT = 209,                       ///< DG drain circulation line timeout
     ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED = 210,                          ///< HD battery pack detected an error
     ALARM_ID_BLOOD_SITTING_WARNING = 211,                                   ///< Blood sitting too long warning (>4 min)
@@ -323,7 +323,7 @@
     ALARM_ID_HD_TREATMENT_RECIRC_TIMEOUT_WARNING = 285,                     ///< HD treatment recirculate timeout warning
     ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING = 286,                  ///< HD treatment rinseback complete timeout warning
     ALARM_ID_HD_FPGA_CLOCK_SPEED_CHECK_FAILURE = 287,                       ///< HD processor clock speed checks against FPGA clock failure
-    ALARM_ID_DG_TRIMMER_HEATER_ON_WITH_NO_FLOW_TIMEOUT = 288,               ///< DG trimmer heater on with flow timeout
+    ALARM_ID_DG_TRIMMER_HEATER_ON_WITH_NO_FLOW_TIMEOUT = 288,               ///< DG trimmer heater on with flow timeout         // TODO remove when DEN-12224 is merged
     ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION = 289,         ///< DG dialysate or concentrate caps not closed
     NUM_OF_ALARM_IDS                                                        ///< Total number of alarms
 };
Index: DGDefs.h
===================================================================
diff -u -r88ef902b047992b779340ae35986b26bd0b8b94e -r48ce983b0a0a8e3aa6bd54f480fb55c9019d2f4e
--- DGDefs.h	(.../DGDefs.h)	(revision 88ef902b047992b779340ae35986b26bd0b8b94e)
+++ DGDefs.h	(.../DGDefs.h)	(revision 48ce983b0a0a8e3aa6bd54f480fb55c9019d2f4e)
@@ -152,11 +152,10 @@
 enum DG_Generation_Idle_Mode_Bad_Fill_Substates
 {
     DG_HANDLE_BAD_FILL_STATE_START = 0,                                   ///< Bad fill start state
-    DG_HANDLE_BAD_FILL_STATE_FIRST_DRAIN,                                 ///< First drain the dialysate                       (idle 1.0)
-    DG_HANDLE_BAD_FILL_STATE_FLUSH_FILL,                                  ///< Flush then fill the dialysate                   (idle 1.1)
-    DG_HANDLE_BAD_FILL_STATE_SECOND_DRAIN,                                ///< Second drain the dialysate                      (idle 1.2)
-    DG_HANDLE_BAD_FILL_STATE_REFILL,                                      ///< Refill the dialysate                            (idle 1.3)
-    DG_HANDLE_BAD_FILL_STATE_CLEAR_ALARM,                                 ///< Clear wait for dialysate alarm to allow resume  (idle 1.4)
+    DG_HANDLE_BAD_FILL_STATE_FIRST_DRAIN,                                 ///< First drain the dialysate
+    DG_HANDLE_BAD_FILL_STATE_FLUSH_FILL,                                  ///< Flush then fill the dialysate
+    DG_HANDLE_BAD_FILL_STATE_SECOND_DRAIN,                                ///< Second drain the dialysate
+    DG_HANDLE_BAD_FILL_STATE_REFILL,                                      ///< Refill the dialysate
     NUM_OF_DG_HANDLE_BAD_FILL_STATES                                      ///< Number of bad fill states
 };
 typedef enum DG_Generation_Idle_Mode_Bad_Fill_Substates DG_GEN_IDLE_MODE_BAD_FILL_STATE_T;   ///< Type for DG generation idle mode bad fill sub-states enumeration