Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -rbdf2c733a764466fcc4a0ff4938f5c97456bdb77 -r0e2bb0e29903be865ff96ba88b5f165bf0e2ff3b
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision bdf2c733a764466fcc4a0ff4938f5c97456bdb77)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 0e2bb0e29903be865ff96ba88b5f165bf0e2ff3b)
@@ -762,8 +762,13 @@
         state = BAL_CHAMBER_STATE_IDLE;
     }
 
+    // If the dry bicarbonate is enabled then we ignore looking at d18 pressure to be in range.
+    if ( ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) ) && ( TRUE == getBicarbChamberFillRequested() ) )
+    {
+        isPressureStabilizedDuringFill = TRUE;
+    }
     // Check fresh dialysate pressure back in range to indicate fresh fill complete.
-    if ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) )
+    else if ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) )
     {
         if ( ++balChamberFillCompleteStablePressureCounter >= BAL_CHAMBER_FILL_COMPLETE_MS )
         {
@@ -1018,9 +1023,14 @@
     freshDialPressure               = getFilteredPressure( D18_PRES );
     spentDialPressure               = getFilteredPressure( D51_PRES );
 
-    // Check fresh dialysate pressure back in range to indicate fill complete.
-    if ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) )
+    // If the dry bicarbonate is enabled then we ignore looking at d18 pressure to be in range.
+    if ( ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) ) && ( TRUE == getBicarbChamberFillRequested() ) )
     {
+        isPressureStabilizedDuringFill = TRUE;
+    }
+    // Check fresh dialysate pressure back in range to indicate fresh fill complete.
+    else if ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) )
+    {
         if ( ++balChamberFillCompleteStablePressureCounter >= BAL_CHAMBER_FILL_COMPLETE_MS )
         {
             // stabilized pressure indicating fresh side fill is complete
Index: firmware/App/Controllers/DryBiCart.h
===================================================================
diff -u -r2d295ca85f19e95da42476a57ca6b4496baf980a -r0e2bb0e29903be865ff96ba88b5f165bf0e2ff3b
--- firmware/App/Controllers/DryBiCart.h	(.../DryBiCart.h)	(revision 2d295ca85f19e95da42476a57ca6b4496baf980a)
+++ firmware/App/Controllers/DryBiCart.h	(.../DryBiCart.h)	(revision 0e2bb0e29903be865ff96ba88b5f165bf0e2ff3b)
@@ -76,6 +76,7 @@
 U32 execDryBicartDrainMode( void );
 void execDryBicart( void );
 BOOL setBicarbChamberFillRequested( void );
+BOOL getBicarbChamberFillRequested( void );
 BOOL setBicartFillRequested( void );
 BOOL setBicartDrainRequested( void );