Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rf6fb03f1e20395a61a5d5996f11f802ab8eacb2f -r0df32171c99e44512f8ea90ab2068e25ef4bcce2
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision f6fb03f1e20395a61a5d5996f11f802ab8eacb2f)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 0df32171c99e44512f8ea90ab2068e25ef4bcce2)
@@ -551,7 +551,6 @@
 
     if ( D5_HEAT == heater )
     {
-       // measuredTemperature = getTemperatureValue( D4_TEMP );
         measuredTemperature = getD4AverageTemperature();
 
         if ( DD_MODE_HEAT != opMode )
@@ -578,7 +577,6 @@
     }
     else
     {
-        //measuredTemperature = getTemperatureValue( D50_TEMP );
         measuredTemperature = getD50AverageTemperature();
 
         if ( DD_MODE_HEAT != opMode )
@@ -631,7 +629,6 @@
     {
         if ( D5_HEAT == heater )
         {
-            //measuredTemperature = getTemperatureValue( D4_TEMP );
             measuredTemperature = getD4AverageTemperature();
             // Inlet temperature post heat exchanger
             inletTemperature    = getTemperatureValue( X6_TEMP );
@@ -665,7 +662,6 @@
         }
         else
         {
-            //measuredTemperature = getTemperatureValue( D50_TEMP );
             measuredTemperature = getD50AverageTemperature();
 
             ctrl = runPIController( PI_CONTROLLER_ID_D45_HEAT, targetTemperature, measuredTemperature );
Index: firmware/App/Monitors/Temperature.c
===================================================================
diff -u -rf6fb03f1e20395a61a5d5996f11f802ab8eacb2f -r0df32171c99e44512f8ea90ab2068e25ef4bcce2
--- firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision f6fb03f1e20395a61a5d5996f11f802ab8eacb2f)
+++ firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision 0df32171c99e44512f8ea90ab2068e25ef4bcce2)
@@ -34,7 +34,7 @@
 
 #define TEMP_SENSORS_DATA_PUBLISH_INTERVAL                      ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )      ///< Temperature sensors publish data time interval.
 #define TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS                      ( 2 * MS_PER_SECOND )                           ///< Temperature sensors FPGA error timeout in milliseconds.
-#define D4_TEMP_MOVING_AVG_NUM_OF_SAMPLES                       ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )      ///< D4 temperature sensor moving average number of samples ( 1sec filter ).
+#define D4_TEMP_MOVING_AVG_NUM_OF_SAMPLES                       ( 2 * MS_PER_SECOND / TASK_PRIORITY_INTERVAL )  ///< D4 temperature sensor moving average number of samples ( 2sec filter ).
 #define D50_TEMP_MOVING_AVG_NUM_OF_SAMPLES                      25                                              ///< D50 temperature sensor moving average number of samples ( 250ms filter ).
 #define DATA_PUBLISH_COUNTER_START_COUNT                        30                                              ///< Data publish counter start count.