Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r7d24ef2e6a4130b3a049e6106a0371fc6503271f -ra521fb80a785babd99f0413dc6223d47375a43bc
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 7d24ef2e6a4130b3a049e6106a0371fc6503271f)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision a521fb80a785babd99f0413dc6223d47375a43bc)
@@ -1002,7 +1002,7 @@
 {
     BOOL result = FALSE;
 
-    // Verify tester has logged in with TD
+    // Verify tester has logged in with DD
     if ( TRUE == isTestingActivated() )
     {
         // Verify payload length is valid
Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r711ff90b0aab45c4acde333f4c9f11be9b62f383 -ra521fb80a785babd99f0413dc6223d47375a43bc
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 711ff90b0aab45c4acde333f4c9f11be9b62f383)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision a521fb80a785babd99f0413dc6223d47375a43bc)
@@ -148,6 +148,7 @@
     SW_FAULT_ID_VOLTAGES_INVALID_SIGNAL = 117,
     SW_FAULT_ID_RINSE_PUMP_INVALID_EXEC_STATE = 118,
     SW_FAULT_ID_RINSE_PUMP_INVALID_STATE1 = 119,
+    SW_FAULT_ID_DRY_BICART_FILL_INVALID_EXEC_STATE = 120,
     NUM_OF_SW_FAULT_IDS
 } DD_SW_FAULT_ID_T;
 
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rdb4ababe9942a6c755ffc11d25af50f598e8dba6 -ra521fb80a785babd99f0413dc6223d47375a43bc
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision db4ababe9942a6c755ffc11d25af50f598e8dba6)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision a521fb80a785babd99f0413dc6223d47375a43bc)
@@ -25,6 +25,7 @@
 #include "Compatible.h"
 #include "ConcentratePumps.h"
 #include "DialysatePumps.h"
+#include "DryBiCart.h"
 #include "Flow.h"
 #include "FlowSensor.h"
 #include "FluidPump.h"
@@ -239,6 +240,9 @@
     { 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_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                  &testDryBiCartDataPublishIntervalOverride },
+    { MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST,                         &testDryBiCartFillCycleMaxCountOverride },
+    { MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST,                           &testDryBiCartFillRequestOverride },
 };
 
 /// Calculation for number of entries in the incoming message function handler look-up table.
Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r711ff90b0aab45c4acde333f4c9f11be9b62f383 -ra521fb80a785babd99f0413dc6223d47375a43bc
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 711ff90b0aab45c4acde333f4c9f11be9b62f383)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision a521fb80a785babd99f0413dc6223d47375a43bc)
@@ -21,6 +21,7 @@
 #include "BoostPump.h"
 #include "ConcentratePumps.h"
 #include "DialysatePumps.h"
+#include "DryBiCart.h"
 #include "Heaters.h"
 #include "FPOperationModes.h"
 #include "Messaging.h"
@@ -93,6 +94,9 @@
     // manage concentrate pumps
     execConcentratePumpController();
 
+    // manage drybicart fill
+    execDryBicartFillMode();
+
     // Control RO pump
     execROPumpController();
 
Index: firmware/source/sys_main.c
===================================================================
diff -u -r711ff90b0aab45c4acde333f4c9f11be9b62f383 -ra521fb80a785babd99f0413dc6223d47375a43bc
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 711ff90b0aab45c4acde333f4c9f11be9b62f383)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision a521fb80a785babd99f0413dc6223d47375a43bc)
@@ -69,6 +69,7 @@
 #include "ConcentratePumps.h"
 #include "DDCommon.h"
 #include "DialysatePumps.h"
+#include "DryBiCart.h"
 #include "Flow.h"
 #include "FlowSensor.h"
 #include "FluidPump.h"
@@ -204,6 +205,7 @@
     initFPInterface();
     initUltrafiltration();
     initRinsePump();
+    initDryBiCart();
 
     // FP Modules