Index: FPDefs.h
===================================================================
diff -u -rf4dcc8b48798363022d3da610d95829f6d4f77a6 -rba8c337d9753e72376e21b6aab9a3f65b027bf65
--- FPDefs.h	(.../FPDefs.h)	(revision f4dcc8b48798363022d3da610d95829f6d4f77a6)
+++ FPDefs.h	(.../FPDefs.h)	(revision ba8c337d9753e72376e21b6aab9a3f65b027bf65)
@@ -49,9 +49,37 @@
 };
 typedef enum FP_POST_States FP_POST_STATE_T;               ///< Type for FP POST states enumeration
 
+
 /**@}*/
 
 /**
+ *  @addtogroup FPFaultMode
+ *  @{
+ */
+
+/// Enumeration of fault mode states.
+enum FP_Fault_States
+{
+    FP_FAULT_STATE_START = 0,                   ///< FP fault start state
+    FP_FAULT_DEENERGIZED_STATE,                 ///< FP fault deenergized state
+    FP_FAULT_ENERGIZED_STATE,                   ///< FP fault energized state
+    NUM_OF_FP_FAULT_STATES                      ///< Number of fault mode states
+};
+typedef enum FP_Fault_States FP_FAULT_STATE_T;  ///< Type for FP fault states enumeration
+
+/// Enumeration of fault NV data management states.
+enum FP_Fault_NVDataMgmt_States
+{
+    FP_FAULT_NVDATA_STATE_START = 0,            ///< FP fault NVData management start state
+    FP_FAULT_NVDATA_STATE_RUN_NV_POSTS,         ///< FP fault run RTC and NV data management posts
+    FP_FAULT_NVDATA_STATE_COMPLETE,             ///< FP fault NVData management complete
+    NUM_OF_FP_FAULT_NVDATA_STATES               ///< Number of fault NVdata management states
+};
+typedef enum FP_Fault_NVDataMgmt_States FP_FAULT_NVDATA_STATE_T;  ///< Type for FP fault NVdata Management states enumeration
+
+/**@}*/
+
+/**
  *  @addtogroup FPStandbyMode
  *  @{
  */
Index: MsgDefs.h
===================================================================
diff -u -r07ae937f8610b178e740b833e2cec3268930f3f7 -rba8c337d9753e72376e21b6aab9a3f65b027bf65
--- MsgDefs.h	(.../MsgDefs.h)	(revision 07ae937f8610b178e740b833e2cec3268930f3f7)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision ba8c337d9753e72376e21b6aab9a3f65b027bf65)
@@ -117,9 +117,9 @@
     MSG_ID_FP_FILTER_FLUSH_DATA = 0x55,                                             ///< FP Filter Flush broadcast data
     MSG_ID_FP_PERMEATE_FLUSH_DATA = 0x56,                                           ///< FP Permeate Flush broadcast data
     MSG_ID_FP_CONCENTRATE_FLUSH_DATA = 0x57,                                        ///< FP Concentrate Flush broadcast data
-    MSG_ID_FP_GENP_DEF_DATA = 0x58,
-    MSG_ID_FP_PRE_GEN_DEF_DATA = 0x59,
-    MSG_ID_FP_VERSION_RESPONSE = 0x5A,
+    MSG_ID_FP_GENP_DEF_DATA = 0x58,                                                 ///< FP Generate Permeate Defeatured broadcast data
+    MSG_ID_FP_PRE_GEN_DEF_DATA = 0x59,                                              ///< FP Pre Generate Permeate Defeatured broadcast data
+    MSG_ID_FP_VERSION_RESPONSE = 0x5A,                                              ///< FP FW Version response
 
 #ifdef __PUMPTEST__
     MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0,                                      ///< DD piston pump data
@@ -286,15 +286,16 @@
     MSG_ID_FP_SET_OPERATION_MODE_REQUEST = 0xB01D,                                  ///< FP set operation mode request
     MSG_ID_FP_OPERATION_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB01E,            ///< FP operation mode publish interval override
     MSG_ID_FP_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB01F,        ///< FP temperature sensor publish interval override
-    MSG_ID_FP_RO_PUMP_TARGET_PRESSURE_OVERRIDE_REQUEST = 0xB020,
-    MSG_ID_FP_RO_PUMP_TARGET_FLOW_OVERRIDE_REQUEST = 0xB021,
-    MSG_ID_FP_RO_PUMP_TARGET_PWM_OVERRIDE_REQUEST = 0xB022,
-    MSG_ID_FP_BOOST_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB023,
-    MSG_ID_FP_BOOST_PUMP_TARGET_PRESSURE_OVERRIDE_REQUEST = 0xB024,
-    MSG_ID_FP_BOOST_PUMP_TARGET_FLOW_OVERRIDE_REQUEST = 0xB025,
-    MSG_ID_FP_BOOST_PUMP_TARGET_PWM_OVERRIDE_REQUEST = 0xB026,
-    MSG_ID_FP_BOOST_PUMP_STOP_REQUEST = 0xB027,
-    MSG_ID_FP_RO_PUMP_STOP_REQUEST = 0xB028,
+    MSG_ID_FP_RO_PUMP_TARGET_PRESSURE_OVERRIDE_REQUEST = 0xB020,                    ///< FP RO Pump Target Pressure override request
+    MSG_ID_FP_RO_PUMP_TARGET_FLOW_OVERRIDE_REQUEST = 0xB021,                        ///< FP RO Pump Target Flow override request
+    MSG_ID_FP_RO_PUMP_TARGET_PWM_OVERRIDE_REQUEST = 0xB022,                         ///< FP RO Pump Target PWM override request
+    MSG_ID_FP_BOOST_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB023,                ///< FP Boost Pump Target data publish interval override request
+    MSG_ID_FP_BOOST_PUMP_TARGET_PRESSURE_OVERRIDE_REQUEST = 0xB024,                 ///< FP Boost Pump Target Pressure override request
+    MSG_ID_FP_BOOST_PUMP_TARGET_FLOW_OVERRIDE_REQUEST = 0xB025,                     ///< FP Boost Pump Target Flow override request
+    MSG_ID_FP_BOOST_PUMP_TARGET_PWM_OVERRIDE_REQUEST = 0xB026,                      ///< FP RO Pump Target PWM override request
+    MSG_ID_FP_BOOST_PUMP_STOP_REQUEST = 0xB027,                                     ///< FP Boost Pump Stop request
+    MSG_ID_FP_RO_PUMP_STOP_REQUEST = 0xB028,                                        ///< FP RO Pump Stop request
+    MSG_ID_FP_SAFETY_SHUTDOWN_OVERRIDE_REQUEST = 0xB029,                            ///< FP Safety Shutdown override request
 
     MSG_ID_TD_DEBUG_EVENT = 0xFFF1,                                                 ///< TD debug event text to be logged in event log
     MSG_ID_DD_DEBUG_EVENT = 0xFFF2,                                                 ///< DD debug event text to be logged in event log