Index: firmware/App/Controllers/DryBiCart.c
===================================================================
diff -u -rf364406cd1f672078ca38ae8aad5bc508e9b64dd -r39fbf9fd993d5e735092cf4ad802d58d0f92f7b1
--- firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision f364406cd1f672078ca38ae8aad5bc508e9b64dd)
+++ firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision 39fbf9fd993d5e735092cf4ad802d58d0f92f7b1)
@@ -27,7 +27,6 @@
 #include "MixingControl.h"
 #include "ModeGenDialysate.h"
 #include "OperationModes.h"
-#include "PIControllers.h"
 #include "PressureSensor.h"
 #include "PersistentAlarm.h"
 #include "Pressure.h"
@@ -280,11 +279,6 @@
     {
         case DRY_BICART_IDLE:
             // run as idle state
-            //DRY_BICART_SUPPLY ;
-            //DRY_BICART_INITIAL_FILL;
-            //DRY_BICART_DRAIN;
-            //default DRY_BICART_IDLE;
-            //the below function select any one of the above request
             updateDrybicartOperation();
             break;
 
@@ -395,7 +389,7 @@
             bicarbChamberFillExecState = handleBicarbChamberCartridgeFillWaterEndState();
             break;
 
-        case BICARB_CHAMBER_FILL_STATE:
+        case BICARB_CHAMBER_SUPPLY_STATE:
             bicarbChamberFillExecState = handleBicarbChamberSupplyStart();
             break;
 
@@ -731,7 +725,7 @@
 {
     DRY_BICART_FILL_EXEC_STATE_T state  = DRY_BICART_FILL_WATER_END_STATE;
     F32 d66Pressure                     = getFilteredPressure( D66_PRES );
-    F32 fillCompletePressure = GET_DRY_BICART_FILL_COMPLETE_PRESSURE_PSI;
+    F32 fillCompletePressure            = GET_DRY_BICART_FILL_COMPLETE_PRESSURE_PSI;
 
     // Close dry bicart inlet water if D66 pressure is 17 PSI
     if ( d66Pressure >= fillCompletePressure )
@@ -1015,7 +1009,7 @@
             setValveState( D65_VALV, VALVE_STATE_CLOSED );
             dryBiCartPersistenceStartTime = 0;
 
-            state = BICARB_CHAMBER_FILL_STATE;
+            state = BICARB_CHAMBER_SUPPLY_STATE;
         }
         // 200 ms persistence on D66 pressure since pressure overshoot just after D65 opening
         if ( TRUE == didTimeout( dryBiCartPersistenceStartTime, DRY_BICART_PERSISTENCE_DURATION_MS ) )
@@ -1024,7 +1018,7 @@
             setValveState( D65_VALV, VALVE_STATE_CLOSED );
             dryBiCartPersistenceStartTime = 0;
 
-            state = BICARB_CHAMBER_FILL_STATE;
+            state = BICARB_CHAMBER_SUPPLY_STATE;
         }
     }
 
Index: firmware/App/Controllers/DryBiCart.h
===================================================================
diff -u -rcd1161514dbaff9e5b222931fff99618e39fd7ec -r39fbf9fd993d5e735092cf4ad802d58d0f92f7b1
--- firmware/App/Controllers/DryBiCart.h	(.../DryBiCart.h)	(revision cd1161514dbaff9e5b222931fff99618e39fd7ec)
+++ firmware/App/Controllers/DryBiCart.h	(.../DryBiCart.h)	(revision 39fbf9fd993d5e735092cf4ad802d58d0f92f7b1)
@@ -18,7 +18,6 @@
 #ifndef __DRY_BICART_H__
 #define __DRY_BICART_H__
 
-#include "PIControllers.h"
 #include "DDCommon.h"
 #include "DDDefs.h"
 
Index: firmware/App/Controllers/MixingControl.c
===================================================================
diff -u -rb65c5a8339507472f1933979c21af7601abf9c1a -r39fbf9fd993d5e735092cf4ad802d58d0f92f7b1
--- firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision b65c5a8339507472f1933979c21af7601abf9c1a)
+++ firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision 39fbf9fd993d5e735092cf4ad802d58d0f92f7b1)
@@ -780,7 +780,7 @@
 
 /*********************************************************************//**
  * @brief
- * The execDialysateCompositionMixingController function adjusts the volume of acid and bicarb based on the target
+ * The handleDialysateCompositionMixing function adjusts the volume of acid and bicarb based on the target
  * conductivity of bicarb and dialysate solution
  * @details \b Inputs: dialysateMix[ mixId ].dialysateMixingState
  * @details \b Outputs:dialysateMix[ mixId ].dialysateMixingState
Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -rb65c5a8339507472f1933979c21af7601abf9c1a -r39fbf9fd993d5e735092cf4ad802d58d0f92f7b1
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision b65c5a8339507472f1933979c21af7601abf9c1a)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 39fbf9fd993d5e735092cf4ad802d58d0f92f7b1)
@@ -35,7 +35,7 @@
 #define COND_SENSOR_REPORT_PERIOD               ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )                              ///< Broadcast conductivity values message every second.
 #define COND_SENSOR_UPDATE_INTERVAL             ( 700 / TASK_PRIORITY_INTERVAL )                                        ///< Time in task intervals for new sensor data
 #define DATA_PUBLISH_COUNTER_START_COUNT        40                                                                      ///< Data publish counter start count.
-#define CONDUCTIVITY_SAMPLE_FILTER_MS           ( 210 )                                                                  ///< Filter conductivity data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate )
+#define CONDUCTIVITY_SAMPLE_FILTER_MS           ( 210 )                                                                 ///< Filter conductivity data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate )
 #define CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS      ( 30 )                                                                  ///< Filter conductivity temperature data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate )
 #define SIZE_OF_COND_ROLLING_AVG                ( CONDUCTIVITY_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL )              ///< Filtered conductivity moving average sample count.
 #define SIZE_OF_COND_TEMP_ROLLING_AVG           ( CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL )         ///< Filtered conductivity temprature moving average sample count.
Index: firmware/App/Services/TDInterface.c
===================================================================
diff -u -r32aa5b5fa1e847e9002c7bfa311a923bbadea3fa -r39fbf9fd993d5e735092cf4ad802d58d0f92f7b1
--- firmware/App/Services/TDInterface.c	(.../TDInterface.c)	(revision 32aa5b5fa1e847e9002c7bfa311a923bbadea3fa)
+++ firmware/App/Services/TDInterface.c	(.../TDInterface.c)	(revision 39fbf9fd993d5e735092cf4ad802d58d0f92f7b1)
@@ -149,7 +149,7 @@
     tdBicarbConvFactor.ovInitData       = BICARBONATE_CONVERSION_FACTOR;
     tdBicarbConvFactor.override         = OVERRIDE_RESET;
 
-    tdSodium.data                       = 0.0F;
+    tdSodium.data                       = TD_SODIUM_MIN;
     tdSodium.ovData                     = 0.0F;
     tdSodium.ovInitData                 = TD_SODIUM_MIN;
     tdSodium.override                   = OVERRIDE_RESET;
Index: firmware/App/Tasks/TaskPriority.c
===================================================================
diff -u -rf364406cd1f672078ca38ae8aad5bc508e9b64dd -r39fbf9fd993d5e735092cf4ad802d58d0f92f7b1
--- firmware/App/Tasks/TaskPriority.c	(.../TaskPriority.c)	(revision f364406cd1f672078ca38ae8aad5bc508e9b64dd)
+++ firmware/App/Tasks/TaskPriority.c	(.../TaskPriority.c)	(revision 39fbf9fd993d5e735092cf4ad802d58d0f92f7b1)
@@ -107,6 +107,7 @@
     // Monitor rinse pump
     execRinsePumpMonitor();
 
+    //TODO: revert back once HDF issue resolved.
     // Monitor Substituion pump
     //execSubstitutionPumpMonitor();