Index: firmware/App/Monitors/BloodLeak.c
===================================================================
diff -u -r9273b79631e50be192556bb9eaffd3f3a22d49d2 -rdabc7e65f46140329a5d8b75343e5adbcb225436
--- firmware/App/Monitors/BloodLeak.c	(.../BloodLeak.c)	(revision 9273b79631e50be192556bb9eaffd3f3a22d49d2)
+++ firmware/App/Monitors/BloodLeak.c	(.../BloodLeak.c)	(revision dabc7e65f46140329a5d8b75343e5adbcb225436)
@@ -1,13 +1,18 @@
 /**************************************************************************
 *
+<<<<<<< HEAD
 * Copyright (c) 2025-2026 Diality Inc. - All Rights Reserved.
+=======
+* Copyright (c) 2025-2025 Diality Inc. - All Rights Reserved.
+>>>>>>> staging
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    BloodLeak.c
 *
 * @author  (last)      Dara Navaei
+<<<<<<< HEAD
 * @date    (last)      10-Sep-2024
 *
 * @author  (original)  Dara Navaei
@@ -388,20 +393,23 @@
  *************************************************************************/
 BOOL isBloodLeakZeroingNeeded( void )
 {
-    BOOL status         = FALSE;
-    TD_OP_MODE_T opMode = getTDOpMode();
+    BOOL status = FALSE;
 
-    if ( MODE_PRET == opMode )
+    TD_MODE_SUB_MODE_T tdModes;
+
+    getTDOperationMode( &tdModes );
+
+    if ( MODE_PRET == tdModes.tdMode )
     {
         U32 intensity = getEmbModeInfoValue( I_EMB_MODE_CMD );
 
         if ( ( intensity <= BLD_START_OF_TX_MIN_INTENSITY_DRIFT ) || ( intensity >= BLD_MAX_UPPER_INTENSITY_DRIFT ) )
         {
-            SEND_EVENT_WITH_2_F32_DATA( DD_EVENT_BLOOD_LEAK_ZEROING_REQUIRED, intensity, opMode )
+            SEND_EVENT_WITH_2_F32_DATA( DD_EVENT_BLOOD_LEAK_ZEROING_REQUIRED, intensity, tdModes.tdMode )
             status = TRUE;
         }
     }
-    else if ( MODE_TREA == opMode )
+    else if ( MODE_TREA == tdModes.tdMode )
     {
         status |= isLowerRangeIntensityDriftZeroingNeeded();
         status |= isUpperIntensityZeroingNeeded();
@@ -704,9 +712,13 @@
 {
     BLOOD_LEAK_STATE_T state = BLOOD_LEAK_NORMAL_STATE;
 
+    TD_MODE_SUB_MODE_T tdModes;
+
+    getTDOperationMode( &tdModes );
+
     bloodLeakStatus.data = getFPGABloodDetectProcessedStatus();
 
-    switch ( getTDOpMode() )
+    switch ( tdModes.tdMode )
     {
         case MODE_TREA:
         case MODE_SERV:
@@ -1047,7 +1059,6 @@
     return result;
 }
 
-
 /*********************************************************************//**
  * @brief
  * The testBloodLeakIntensityMovingAverageOverride function overrides the
Index: firmware/App/Monitors/BloodLeak.h
===================================================================
diff -u -r9273b79631e50be192556bb9eaffd3f3a22d49d2 -rdabc7e65f46140329a5d8b75343e5adbcb225436
--- firmware/App/Monitors/BloodLeak.h	(.../BloodLeak.h)	(revision 9273b79631e50be192556bb9eaffd3f3a22d49d2)
+++ firmware/App/Monitors/BloodLeak.h	(.../BloodLeak.h)	(revision dabc7e65f46140329a5d8b75343e5adbcb225436)
@@ -1,12 +1,17 @@
 /**************************************************************************
 *
+<<<<<<< HEAD
 * Copyright (c) 2025-2026 Diality Inc. - All Rights Reserved.
+=======
+* Copyright (c) 2025-2025 Diality Inc. - All Rights Reserved.
+>>>>>>> staging
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    BloodLeak.h
 *
+<<<<<<< HEAD
 * @author  (last)      Dara Navaei
 * @date    (last)      10-Sep-2024
 *
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -ra05a0eb6d5aa38f5d026b9049a6284282e192172 -rdabc7e65f46140329a5d8b75343e5adbcb225436
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision a05a0eb6d5aa38f5d026b9049a6284282e192172)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision dabc7e65f46140329a5d8b75343e5adbcb225436)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2024-2025 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    Messaging.c
 *
-* @author  (last)      Vinayakam Mani
-* @date    (last)      06-Aug-2024
+* @author  (last)      “rkallala”
+* @date    (last)      09-Dec-2025
 *
 * @author  (original)  Vinayakam Mani
-* @date    (original)  06-Aug-2024
+* @date    (original)  07-Aug-2024
 *
 ***************************************************************************/
 
@@ -234,12 +234,15 @@
     { MSG_ID_FP_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,                  &testFPConductivitySensorFilteredTemperatureReadingsOverride },
     { MSG_ID_DD_VOLTAGE_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                     &testVoltageDataPublishIntervalOverride },
     { MSG_ID_DD_MONITORED_VOLTAGE_OVERRIDE_REQUEST,                                 &testVoltageOverride },
+    { MSG_ID_DD_TREATMENT_PARAMS_OVERRIDE_REQUEST,                                  &testTDTreatmentParamsOverride },
     { MSG_ID_FP_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                            &testFPLevelsDataPublishIntervalOverride },
     { MSG_ID_FP_LEVEL_OVERRIDE_REQUEST,                                             &testFPLevelStateOverride },
     { MSG_ID_FP_PERMEATE_TANK_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                    &testPermeateTankDataPublishIntervalOverride },
     { MSG_ID_FP_RO_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                          &testROPumpDataPublishIntervalOverride },
     { MSG_ID_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                  &testRinsePumpDataPublishIntervalOverride },
     { MSG_ID_FP_SET_START_STOP_OVERRIDE_REQUEST,                                    &testSetGeneratePermeateSignal },
+    {  MSG_ID_FP_RO_REJECTION_RATIO_PUBLISH_INTERVAL_OVERRIDE_REQUEST,              &testRORejectionRatioDataPublishIntervalOverride },
+    {  MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST,                      &testRORejectionRatioFilteredOverride },
 };
 
 /// Calculation for number of entries in the incoming message function handler look-up table.