Index: AlarmDefs.h
===================================================================
diff -u -r2e9d0f6c4ca1ddcc8a0940baddeeec200e226353 -re952d761cda4df505d081bb5b05404d2168dbbd9
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 2e9d0f6c4ca1ddcc8a0940baddeeec200e226353)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision e952d761cda4df505d081bb5b05404d2168dbbd9)
@@ -78,7 +78,7 @@
     ALARM_ID_DIAL_OUT_PUMP_OFF_CHECK = 40,                                  ///< Dialysis outlet pump failed motor off check.  Measured speed while commanded off
     ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK = 41,                         ///< Dialysis outlet pump failed motor direction check.  Measured vs. commanded
     ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK = 42,                          ///< Dialysis outlet pump failed rotor speed check.  Mismatch with rotor and motor speeds
-    ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAULT = 43,                            ///< HD blood leak self test fault
+    ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAULT = 43,     // TODO remove when DEN-13460 was merged                       ///< HD blood leak self test fault
     ALARM_ID_UI_COMM_TIMEOUT = 44,                                          ///< User interface communication timeout
     ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS = 45,                                ///< HD too many bad communications CRC
     ALARM_ID_CAN_MESSAGE_NOT_ACKED = 46,                                    ///< System message that required acknowledgment was not acknowledged
@@ -109,7 +109,7 @@
     ALARM_ID_HD_VENOUS_PRESSURE_SELF_TEST_FAILURE = 71,                     ///< HD venous pressure self-test failure alarm
     ALARM_ID_HD_NEW_LOAD_CELL_DATA_MESSAGE_NOT_RECEIVE = 72,                ///< HD No load cell data message receive at least once every 2 seconds
     ALARM_ID_HD_NEW_DIALYSATE_TEMPERATURE_DATA_MESSAGE_NOT_RECEIVE = 73,    ///< HD No dialysate temperature data message receive at least once every 2 seconds
-    ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_SEND_TIMEOUT = 74,                     ///< HD blood leak detector self-test transmit timeout
+    ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_SEND_TIMEOUT = 74,     // TODO remove when DEN-13460 was merged                 ///< HD blood leak detector self-test transmit timeout
     ALARM_ID_HD_SYRINGE_PUMP_SELF_TEST_FAILURE = 75,                        ///< HD syringe pump self-test failure alarm
     ALARM_ID_HD_VOLTAGE_OUT_OF_RANGE = 76,                                  ///< HD monitored voltage is out of range
     ALARM_ID_DG_VOLTAGE_OUT_OF_RANGE = 77,                                  ///< DG monitored voltage is out of range
@@ -147,8 +147,8 @@
     ALARM_ID_HD_SYRINGE_PUMP_VOLUME_ERROR = 109,                            ///< HD syringe pump volume check error
     ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR = 110,                             ///< HD syringe pump speed check error
     ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR = 111,                       ///< HD syringe pump not stopped in off state error
-    ALARM_ID_HD_BLOOD_LEAK_ZERO_CMD_SEND_TIMEOUT = 112,                     ///< HD blood leak zero command transmit timeout.
-    ALARM_ID_HD_BLOOD_LEAK_ZERO_CMD_FAULT = 113,                            ///< HD blood leak zero command fault.
+    ALARM_ID_HD_BLOOD_LEAK_ZERO_CMD_SEND_TIMEOUT = 112,  // TODO remove when DEN-13460 was merged                   ///< HD blood leak zero command transmit timeout.
+    ALARM_ID_HD_BLOOD_LEAK_ZERO_CMD_FAULT = 113,         // TODO remove when DEN-13460 was merged                   ///< HD blood leak zero command fault.
     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_SENSORS_ADC_FAULT = 116,                        ///< DG temperature sensor ADC fault
Index: HDDefs.h
===================================================================
diff -u -r2e9d0f6c4ca1ddcc8a0940baddeeec200e226353 -re952d761cda4df505d081bb5b05404d2168dbbd9
--- HDDefs.h	(.../HDDefs.h)	(revision 2e9d0f6c4ca1ddcc8a0940baddeeec200e226353)
+++ HDDefs.h	(.../HDDefs.h)	(revision e952d761cda4df505d081bb5b05404d2168dbbd9)
@@ -89,7 +89,9 @@
 /// Enumeration of fault mode states.
 enum HD_Fault_States
 {
-    HD_FAULT_STATE_START = 0,                           ///< Start fault state
+    HD_FAULT_STATE_START = 0,                           ///< HD fault start state
+    HD_FAULT_STATE_RUN_NV_POSTS,                        ///< HD fault run NV posts state
+    HD_FAULT_STATE_COMPLETE,                            ///< HD fault run complete state
     NUM_OF_HD_FAULT_STATES                              ///< Number of fault mode states
 };
 typedef enum HD_Fault_States HD_FAULT_STATE_T;          ///< Type for HD fault states enumeration