Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r830213bc6dcc1a684610caf78c79d55f2cb41e93 -r771a741a1698770e6997c6657bd520fb557d0f2d
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 830213bc6dcc1a684610caf78c79d55f2cb41e93)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 771a741a1698770e6997c6657bd520fb557d0f2d)
@@ -416,6 +416,9 @@
     freshDialPressure     = getFilteredPressure( D18_PRES );
     spentDialPressure     = getFilteredPressure( D51_PRES );
 
+    //Set Trimmer heater Target temp every BC cycle to catch up fresh dialysate temp
+    setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+
     // Check fresh and spent dialysate pressure in range or BC switch only flag set
     if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) &&
          ( ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) ||
@@ -517,22 +520,15 @@
     spentDialPressure = getFilteredPressure( D51_PRES );
 
     // Check fresh and spent dialysate pressure back in range to indicate fill complete.
-    if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
+    if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) &&
+         ( ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) )
     {
-        if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) &&
-             ( ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) )
+        if ( ++balChamberFillCompleteStablePressureCounter >= BAL_CHAMBER_FILL_COMPLETE_MS )
         {
-            if ( ++balChamberFillCompleteStablePressureCounter >= BAL_CHAMBER_FILL_COMPLETE_MS )
-            {
-                // stabilized pressure indicating fill is complete
-                isPressureStalbilizedDuringFill = TRUE;
-            }
+            // stabilized pressure indicating fill is complete
+            isPressureStalbilizedDuringFill = TRUE;
         }
     }
-    else
-    {
-        isPressureStalbilizedDuringFill = FALSE;
-    }
 
     // Switching time met or pressure in range, close valves
     if ( ( currentBalChamberSwitchingCounter >= balChamberValveClosePeriod ) ||
@@ -630,6 +626,9 @@
     freshDialPressure     = getFilteredPressure( D18_PRES );
     spentDialPressure     = getFilteredPressure( D51_PRES );
 
+    //Set Trimmer heater Target temp every BC cycle to catch up fresh dialysate temp
+    setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+
     // Check fresh and spent dialysate pressure in range
     if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) &&
          ( ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) ||
@@ -680,22 +679,15 @@
     spentDialPressure = getFilteredPressure( D51_PRES );
 
     // Check fresh and spent dialysate pressure back in range to indicate fill complete.
-    if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
+    if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) &&
+         ( ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) )
     {
-        if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) &&
-             ( ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) )
+        if ( ++balChamberFillCompleteStablePressureCounter >= BAL_CHAMBER_FILL_COMPLETE_MS )
         {
-            if ( ++balChamberFillCompleteStablePressureCounter >= BAL_CHAMBER_FILL_COMPLETE_MS )
-            {
-                // stabilized pressure indicating fill is complete
-                isPressureStalbilizedDuringFill = TRUE;
-            }
+            // stabilized pressure indicating fill is complete
+            isPressureStalbilizedDuringFill = TRUE;
         }
     }
-    else
-    {
-        isPressureStalbilizedDuringFill = FALSE;
-    }
 
     // Check switching cycle time or pressure check for valve closure
     if ( ( currentBalChamberSwitchingCounter >= balChamberValveClosePeriod ) ||