Index: MsgDefs.h
===================================================================
diff -u -r983c3c348aa50d7da0a285b891da3e88462e84a9 -r3f3f2aab57696a242417767db7c054b7e1da60a5
--- MsgDefs.h	(.../MsgDefs.h)	(revision 983c3c348aa50d7da0a285b891da3e88462e84a9)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 3f3f2aab57696a242417767db7c054b7e1da60a5)
@@ -210,11 +210,11 @@
     MSG_ID_TD_HEPARIN_PAUSE_RESUME_RESPONSE= 0xB2,                                  ///< TD response to pause/resume Heparin delivery request
     MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE = 0xB3,                                   ///< FFU signal TD update is available.
     MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE = 0xB4,                                   ///< FFU signal DD update is available.
-    MSG_ID_TD_UI_CONFIRMATION_REQUEST = 0xB5,                                       ///< TD request UI cancel.   ToDo need update
-    MSG_ID_UI_CONFIRMATION_RESULT_RESPONSE = 0xB6,                                  ///< UI confirmation result response
-    MSG_ID_TD_POWER_OFF_REQUEST = 0xB7,
+    MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST = 0xB5,                               ///< TD request for generic UI confirmation.
+    MSG_ID_UI_GENERIC_CONFIRMATION_RESULT_RESPONSE = 0xB6,                          ///< UI generic confirmation result to TD.
     MSG_ID_TD_POST_FINAL_TEST_RESULT = 0xD8,                                        ///< TD POST final test result
     MSG_ID_TD_POST_SINGLE_TEST_RESULT = 0xD9,                                       ///< TD POST single test result
+
     // service/test CAN messages
     MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000,                                        ///< First TD test message ID
     MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TD_TESTER_MESSAGE,                   ///< TD tester log-in
@@ -567,6 +567,7 @@
     REQUEST_REJECT_REASON_TD_AUTHENTICATION_INVALID = 57,                           ///< TD authentication invalid
     REQUEST_REJECT_REASON_CONFIRMATION_NOT_EXPECTED = 58,                           ///< Confirmation received without prior validation
     REQUEST_REJECT_REASON_CONFIRMATION_MISMATCH = 59,                               ///< Confirmed value does not match validated value
+    REQUEST_REJECT_REASON_SYSTEM_IN_OPERATIONMODE = 60,                             ///<
     NUM_OF_REQUEST_REJECT_REASONS                                                   ///< Number of settings change reject codes
 };
 typedef enum Request_Reject_Reasons REQUEST_REJECT_REASON_CODE_T;                   ///< Type for settings change rejection reason codes enumeration
Index: TDDefs.h
===================================================================
diff -u -r983c3c348aa50d7da0a285b891da3e88462e84a9 -r3f3f2aab57696a242417767db7c054b7e1da60a5
--- TDDefs.h	(.../TDDefs.h)	(revision 983c3c348aa50d7da0a285b891da3e88462e84a9)
+++ TDDefs.h	(.../TDDefs.h)	(revision 3f3f2aab57696a242417767db7c054b7e1da60a5)
@@ -59,11 +59,10 @@
     POST_STATE_BLOOD_FLOW,                              ///< Run blood flow test state
     POST_STATE_VALVES,                                  ///< Run valves test state
     POST_STATE_SYRINGE_PUMP,                            ///< Run syringe pump test state
-    POST_STATE_PRESSURE,                                ///< Run pressure occlusion state
+    POST_STATE_PRESSURE,                                ///< Run pressure state
     POST_STATE_ALARM_AUDIO,                             ///< Run alarm audio test state
     POST_STATE_ALARM_LAMP,                              ///< Run alarm lamp test state
     POST_STATE_TEMPERATURES,                            ///< Run temperatures POST state
-    POST_STATE_FANS,                                    ///< Run fans POST state
     POST_STATE_STUCK_BUTTON,                            ///< Run stuck button test state
     POST_STATE_UI_POST,                                 ///< Check whether UI passed its POST tests
     POST_STATE_FW_COMPATIBILITY,                        ///< Run firmware compatibility test state
@@ -835,6 +834,7 @@
     GENERIC_CONFIRM_CMD_TIMEOUT_CLOSE   = 1,                            ///< Generic Confirm command to hide    the confirmation, due to timeout user confirmation
     GENERIC_CONFIRM_CMD_REJECT          = 2,                            ///< Generic Confirm command to display the confirmation rejection in case the request in not valid/accepted anymore.
     GENERIC_CONFIRM_CMD_ACCEPT_CLOSE    = 3,                            ///< Generic Confirm command to hide    the confirmation, due to accept  user confirmation.
+    GENERIC_CONFIRM_CMD_REQUEST_INPROGRESS = 4,                         ///< Generic Confirm command to disply Shutdown inprogress
     NUM_OF_GENERIC_CONFIRM_COMMAND                                      ///< Total number of generic confirm commands
 };
 typedef enum Generic_Confirm_Command GENERIC_CONFIRM_COMMAND_T;         ///< Type for generic confirm enumeration
@@ -850,12 +850,13 @@
 enum Generic_Confirm_Id
 {
     GENERIC_CONFIRM_ID_NONE = 0,                                        ///< Generic Confirm None
+    GENERIC_CONFIRM_ID_POWER_OFF,                                       ///< Power Off, User confirmation
+    GENERIC_CONFIRM_ID_TREATMENT_END,                                   ///< End treatment user confirmation
     GENERIC_CONFIRM_ID_DISINFECT_STOP_WATERFLUSH,                       ///< Water flush stop user confirmation
     GENERIC_CONFIRM_ID_DISINFECT_STOP_HEAT,                             ///< Heat disinfect stop user confirmation
     GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL,                         ///< Chemical disinfect stop user confirmation
     GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL_FLUSH,                   ///< Chemical disinfect flush stop user confirmation
     GENERIC_CONFIRM_ID_DISINFECT_CHEM_FLUSH_SAMPLE_PASS_FAIL,           ///< Chemical disinfect sample flush pass/fail
-    GENERIC_CONFIRM_ID_TREATMENT_END,                                   ///< End treatment user confirmation
     GENERIC_CONFIRM_ID_DISINFECT_STOP_ACTIVE_COOL,                      ///< Active cool stop user confirmation
     GENERIC_CONFIRM_ID_DISINFECT_STOP_RO_PERMEATE_SAMPLE,               ///< RO permeate sample stop user confirmation
     GENERIC_CONFIRM_ID_RO_PERMEATE_SAMPLE_STOP_OR_DISPENSE,             ///< RO permeate sample stop or dispense