Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r4b09605126f35b80406e95d079f3822c51a3ba25 -r9012cfee881655869e21c5fddf51d7517ce5f6ea
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 4b09605126f35b80406e95d079f3822c51a3ba25)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 9012cfee881655869e21c5fddf51d7517ce5f6ea)
@@ -138,6 +138,10 @@
     SW_FAULT_ID_PRE_GEND_WET_SELF_TEST_INVALID_EXEC_STATE = 107,
     SW_FAULT_ID_PRE_GEND_WET_SELF_TEST_INVALID_EXEC_STATE1 = 108,
     SW_FAULT_ID_UF_INVALID_EXEC_STATE = 109,
+    SW_FAULT_ID_TD_INVALID_BLOOD_LEAK_STATE = 111,
+    SW_FAULT_ID_BLOOD_LEAK_EMBEDDED_MODE_INVALID_STATE = 112,
+    SW_FAULT_ID_BLOOD_LEAK_ENQUEUE_FAILURE = 113,
+    SW_FAULT_ID_BLOOD_LEAK_INVALID_EMB_MODE_CMD_SELECTED = 114,
 #ifdef __PUMPTEST__
     // Assigning high value to separate from actual fault id from test fault ids.
     SW_FAULT_ID_PISTON_PUMP_EXEC_INVALID_STATE = 9000,
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r573a26b2a0273a4983b1de1cbff5bed63e01dce0 -r9012cfee881655869e21c5fddf51d7517ce5f6ea
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 573a26b2a0273a4983b1de1cbff5bed63e01dce0)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 9012cfee881655869e21c5fddf51d7517ce5f6ea)
@@ -19,6 +19,7 @@
 
 #include "reg_system.h"
 #include "BalancingChamber.h"
+#include "BloodLeak.h"
 #include "Conductivity.h"
 #include "Compatible.h"
 #include "ConcentratePumps.h"
@@ -163,6 +164,14 @@
     { MSG_ID_FW_VERSIONS_REQUEST,                                                   &handleVersionRequestMessage },
     { MSG_ID_DD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST,                                   &testSetResetSafetyShutdownOverride },
     { MSG_ID_DD_UF_DATA_PUBLISH_OVERRIDE_REQUEST,                                   &testDDUFDataPublishIntervalOverride },
+    { MSG_ID_DD_BLOOD_LEAK_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                  &testBloodLeakDataPublishIntervalOverride },
+    { MSG_ID_DD_BLOOD_LEAK_STATUS_OVERRIDE_REQUEST,                                 &testBloodLeakStatusOverride },
+    { MSG_ID_DD_BLOOD_LEAK_SET_TO_EMBEDDED_MODE_REQUEST,                            &testSetBloodLeak2EmbeddedMode },
+    { MSG_ID_DD_BLOOD_LEAK_SET_EMBEDDED_MODE_CMD_REQUEST,                           &testSetBloodLeakEmbeddedModeCommand },
+    { MSG_ID_DD_BLOOD_LEAK_EMBEDDED_MODE_INFO_OVERRIDE_REQUEST,                     &testBloodLeakEmbeddedModeInfoOverride },
+    { MSG_ID_DD_BLOOD_LEAK_INTENSITY_MOVING_AVERAGE_OVERRIDE_REQUEST,               &testBloodLeakIntensityMovingAverageOverride },
+    { MSG_ID_DD_BLOOD_LEAK_ZEROING_INTERVAL_IN_MS_OVERRIDE_REQUEST,                 &testBloodLeakZeroingIntervalInMillisecondsOverride },
+    { MSG_ID_DD_BLOOD_LEAK_ZERO_REQUEST,                                            &testBloodLeakZeroSequenceRequest },
 #ifdef __PUMPTEST__
     { MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST,                          &testDDPistonPumpControlDataPublishIntervalOverride },
     { MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST,                            &testDDPistonPumpStartStopOverride },
Index: firmware/source/sys_main.c
===================================================================
diff -u -re0102a0a08c0d83bcc8e959551079063e2e60d9f -r9012cfee881655869e21c5fddf51d7517ce5f6ea
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision e0102a0a08c0d83bcc8e959551079063e2e60d9f)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 9012cfee881655869e21c5fddf51d7517ce5f6ea)
@@ -61,6 +61,7 @@
 #include "sys_dma.h"
 
 #include "AlarmMgmtDD.h"
+#include "BloodLeak.h"
 #include "CommBuffers.h"
 #include "Conductivity.h"
 #include "ConcentratePumps.h"
@@ -184,6 +185,7 @@
     initTDInterface();
     initFPInterface();
     initUltrafiltration();
+    initBloodLeak();
 #ifdef __PUMPTEST__
     initPistonPump();
 #endif