Index: firmware/App/Controllers/TemperatureSensors.h
===================================================================
diff -u -re83f47ec5c3d458701a32069dba4fe81aae6fd67 -r57007cd9fc64466a979f6613763a243d77743117
--- firmware/App/Controllers/TemperatureSensors.h	(.../TemperatureSensors.h)	(revision e83f47ec5c3d458701a32069dba4fe81aae6fd67)
+++ firmware/App/Controllers/TemperatureSensors.h	(.../TemperatureSensors.h)	(revision 57007cd9fc64466a979f6613763a243d77743117)
@@ -41,8 +41,8 @@
     TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE_TEMP_SESNOR,   ///< Trimmer heater internal temperature sensor          //TODO update AE
     TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION_TEMP_SENSOR,   ///< Primary heaters cold junction temperature sensor    //TODO add to AE
     TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION_TEMP_SENSOR,   ///< Trimmer heater cold junction temperature sensor     //TODO add to AE
-    TEMPSENSORS_PRIMARY_HEATER_INTERNAL_TEMP,               ///< Primary heaters internal temperature
-    TEMPSENSORS_TRIMMER_HEATER_INTERNAL_TEMP,
+    TEMPSENSORS_PRIMARY_HEATER_INTERNAL_TEMP,               ///< Primary heaters internal temperature                //TODO add to AE
+    TEMPSENSORS_TRIMMER_HEATER_INTERNAL_TEMP,               ///< Trimmer heater internal temperature                 //TODO add to AE
     NUM_OF_TEMPERATURE_SENSORS                              ///< Number of temperature sensors
 } TEMPERATURE_SENSORS_T;
 
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -ra1cce9bd6eaa93435e55d7328e24b39d521a266f -r57007cd9fc64466a979f6613763a243d77743117
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision a1cce9bd6eaa93435e55d7328e24b39d521a266f)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 57007cd9fc64466a979f6613763a243d77743117)
@@ -1004,6 +1004,10 @@
                 handleSetRTCTimestamp( message );
                 break;
 
+            case MSG_ID_START_STOP_PRIMARY_HEATER:
+                handleStartStopPrimaryHeater ( message );
+                break;
+
             case MSG_ID_LOAD_CELL_OVERRIDE:
                 handleTestLoadCellOverrideRequest( message );
                 break;
@@ -1012,6 +1016,10 @@
                 handleTestTemperatureSensorsOverrideRequest ( message );
                 break;
 
+            case MSG_ID_HEATERS_PUBLISH_INTERVAL_ORVERRIDE:
+                handleTestHeatersDataPublishOverrideRequest ( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -re83f47ec5c3d458701a32069dba4fe81aae6fd67 -r57007cd9fc64466a979f6613763a243d77743117
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e83f47ec5c3d458701a32069dba4fe81aae6fd67)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 57007cd9fc64466a979f6613763a243d77743117)
@@ -597,6 +597,19 @@
                                       testSetMeasuredTemperatureOverride, testResetMeasuredTemperatureOverride )
 
 /*************************************************************************
+* @brief
+* The handleTestTemperatureSensorsDataPublishOverrideRequest function handles \n
+* a request to override the publish interval of temperature sensors data
+* @details
+* Inputs : none
+* Outputs : message handled
+* @param message : a pointer to the message to handle
+* @return none
+*************************************************************************/
+DATA_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestTemperatureSensorsDataPublishOverrideRequest, \
+                                testSetTemperatureSensorsPublishIntervalOverride, testResetTemperatureSensorsPublishIntervalOverride )
+
+/*************************************************************************
  * @brief
  * The handleTestHeatersDataPublishOverrideRequest function handles \n
  * a request to override the publish interval of heaters data
@@ -617,7 +630,7 @@
  * Inputs : none
  * Outputs : message handled
  * @param message : a pointer to the message to handle
- * @return none
+ * @return result
  *************************************************************************/
 void handleSetRTCTimestamp( MESSAGE_T *message )
 {
@@ -638,3 +651,31 @@
     // respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
+
+/*************************************************************************
+ * @brief
+ * The handleStartStopPrimaryHeater function handles a request start or
+ * stop the primary heater
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return result
+ *************************************************************************/
+BOOL handleStartStopPrimaryHeater( MESSAGE_T * message )
+{
+    BOOL result;
+    U32 heaterStatus = message->payload[0];
+
+    if ( heaterStatus == 1 )
+    {
+        result = startPrimaryHeater();
+    }
+    else
+    {
+        stopPrimaryHeater();
+        result = TRUE;
+    }
+
+    return result;
+}
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -re83f47ec5c3d458701a32069dba4fe81aae6fd67 -r57007cd9fc64466a979f6613763a243d77743117
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision e83f47ec5c3d458701a32069dba4fe81aae6fd67)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 57007cd9fc64466a979f6613763a243d77743117)
@@ -76,5 +76,8 @@
 // MSG_ID_SET_RTC_TIMESTAMP
 void handleSetRTCTimestamp( MESSAGE_T *message );
 
+// MSG_ID_START_STOP_PRIMARY_HEATER
+BOOL handleStartStopPrimaryHeater( MESSAGE_T * message );
+
 #endif