Index: firmware/App/Controllers/Ultrafiltration.c
===================================================================
diff -u -r3417933e6edf61a914c428e2fa944b3b349272a4 -r3f65e4b1e11315bd6ca3a30a80fd4848a9081dda
--- firmware/App/Controllers/Ultrafiltration.c	(.../Ultrafiltration.c)	(revision 3417933e6edf61a914c428e2fa944b3b349272a4)
+++ firmware/App/Controllers/Ultrafiltration.c	(.../Ultrafiltration.c)	(revision 3f65e4b1e11315bd6ca3a30a80fd4848a9081dda)
@@ -104,8 +104,12 @@
     // Calculate UF volume and determine UF pause/run
     updateUFRequest();
 
-    // Compensate balancing error at defined interval
-    UpdateUFCompensation();
+    // Trimmer heater enabled, hence UF temp compensation is optional
+    if ( getTestConfigStatus( TEST_CONFIG_ENABLE_UF_TEMP_COMPENSATION ) == TRUE )
+    {
+        // Compensate balancing error at defined interval
+        UpdateUFCompensation();
+    }
 
     // execute current ultrafiltration exec state
     switch ( ufExecState )
@@ -181,10 +185,10 @@
 
 /*********************************************************************//**
  * @brief
- * The updateUFRequest function updates the ultrafiltration rate per iteration
- * and of the ultrafiltration.
+ * The updateUFRequest function updates the ultrafiltration requested
+ * flag to true or false based on the conditions.
  * @details \b Inputs: TD Uf rate, TD Dialysate flow rate and bypass flag
- * @details \b Outputs: ufVolumeperIteration , isUltrafiltrationRequested
+ * @details \b Outputs: isUltrafiltrationRequested
  * @return none.
  *************************************************************************/
 static void updateUFRequest( void )