Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r838bd7060d127e6967559bc2b3998eac201bf738 -r4aa103de34d50b66f86368da36412afcd45db49e
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 838bd7060d127e6967559bc2b3998eac201bf738)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 4aa103de34d50b66f86368da36412afcd45db49e)
@@ -7,8 +7,8 @@
 *
 * @file    AlarmMgmtSWFaults.h
 *
-* @author  (last)      Sameer Kalliadan Poyil
-* @date    (last)      02-Mar-2026
+* @author  (last)      Raghu Kallala
+* @date    (last)      29-Apr-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -182,8 +182,10 @@
     SW_FAULT_ID_VALVES_INVALID_VALVE_FINDING_EDGE = 151,
     SW_FAULT_ID_TD_VALVES_INVALID_FIND_DEENERGIZED_EDGE = 152,
     SW_FAULT_ID_BLOOD_PRIME_INVALID_STATE = 153,
-    SW_FAULT_ID_MODE_PRE_TREATMENT_INVALID_STATE = 148,
-    SW_FAULT_ID_TD_AIR_PUMP_DUTY_CYCLE_OUT_OF_RANGE = 149,
+    SW_FAULT_ID_MODE_PRE_TREATMENT_INVALID_STATE = 154,
+    SW_FAULT_ID_TD_AIR_PUMP_DUTY_CYCLE_OUT_OF_RANGE = 155,
+    SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER = 156,
+    SW_FAULT_ID_INVALID_TREATMENT_MODALITY = 157,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;
 
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r838bd7060d127e6967559bc2b3998eac201bf738 -r4aa103de34d50b66f86368da36412afcd45db49e
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 838bd7060d127e6967559bc2b3998eac201bf738)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 4aa103de34d50b66f86368da36412afcd45db49e)
@@ -7,8 +7,8 @@
 *
 * @file    Messaging.c
 *
-* @author  (last)      Jashwant Gantyada
-* @date    (last)      22-Mar-2026
+* @author  (last)      Raghu Kallala
+* @date    (last)      06-Apr-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -108,8 +108,6 @@
     { MSG_ID_DD_OP_MODE_DATA,                                           &setDDOpMode },
     { MSG_ID_DD_PRESSURES_DATA,                                         &setDialysatePressure },
     { MSG_ID_UI_TREATMENT_PARAMS_TO_VALIDATE,                           &validateAndSetTreatmentParameters },
-    { MSG_ID_UI_ULTRAFILTRATION_VOLUME_TO_VALIDATE,                     &validateAndSetUFVolume },
-    { MSG_ID_UI_TREATMENT_PARAMS_CONFIRMED,                             &signalUserConfirmationOfTreatmentParameters },
     { MSG_ID_UI_INITIATE_TREATMENT_WORKFLOW,                            &signalUserInitiateTreatment },
     { MSG_ID_UI_UF_PAUSE_RESUME_REQUEST,                                &signalPauseResumeUF },
     { MSG_ID_TESTER_LOGIN_REQUEST,                                      &handleTesterLogInRequest },