diff --git a/generators/bsp_q7s_events.csv b/generators/bsp_q7s_events.csv
index 88fb35b5..34326f6b 100644
--- a/generators/bsp_q7s_events.csv
+++ b/generators/bsp_q7s_events.csv
@@ -88,6 +88,7 @@
 11404;0x2c8c;SWITCH_ALREADY_ON;LOW;;mission/devices/HeaterHandler.h
 11405;0x2c8d;SWITCH_ALREADY_OFF;LOW;;mission/devices/HeaterHandler.h
 11406;0x2c8e;MAIN_SWITCH_TIMEOUT;MEDIUM;;mission/devices/HeaterHandler.h
+11407;0x2c8f;FAULTY_HEATER_WAS_ON;LOW;;mission/devices/HeaterHandler.h
 11500;0x2cec;MAIN_SWITCH_ON_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h
 11501;0x2ced;MAIN_SWITCH_OFF_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h
 11502;0x2cee;DEPLOYMENT_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
diff --git a/generators/bsp_q7s_returnvalues.csv b/generators/bsp_q7s_returnvalues.csv
index a1b8e422..faf6dd65 100644
--- a/generators/bsp_q7s_returnvalues.csv
+++ b/generators/bsp_q7s_returnvalues.csv
@@ -389,6 +389,7 @@
 0x2e03; ASC_BufferTooSmall;;0x3;fsfw/src/fsfw/globalfunctions/AsciiConverter.h;ASCII_CONVERTER
 0x1701; HHI_ObjectNotHealthy;;1;fsfw/src/fsfw/health/HasHealthIF.h;HAS_HEALTH_IF
 0x1702; HHI_InvalidHealthState;;2;fsfw/src/fsfw/health/HasHealthIF.h;HAS_HEALTH_IF
+0x1703; HHI_IsExternallyControlled;;3;fsfw/src/fsfw/health/HasHealthIF.h;HAS_HEALTH_IF
 0x3101; CF_ObjectHasNoFunctions;;1;fsfw/src/fsfw/action/CommandsActionsIF.h;COMMANDS_ACTIONS_IF
 0x3102; CF_AlreadyCommanding;;2;fsfw/src/fsfw/action/CommandsActionsIF.h;COMMANDS_ACTIONS_IF
 0x3201; HF_IsBusy;;1;fsfw/src/fsfw/action/HasActionsIF.h;HAS_ACTIONS_IF
diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp
index 7cf4646b..08283d78 100644
--- a/generators/events/translateEvents.cpp
+++ b/generators/events/translateEvents.cpp
@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 202 translations.
+ * @brief    Auto-generated event translation file. Contains 203 translations.
  * @details
- * Generated on: 2022-05-12 14:08:08
+ * Generated on: 2022-05-12 20:45:27
  */
 #include "translateEvents.h"
 
@@ -95,6 +95,7 @@ const char *HEATER_WENT_OFF_STRING = "HEATER_WENT_OFF";
 const char *SWITCH_ALREADY_ON_STRING = "SWITCH_ALREADY_ON";
 const char *SWITCH_ALREADY_OFF_STRING = "SWITCH_ALREADY_OFF";
 const char *MAIN_SWITCH_TIMEOUT_STRING = "MAIN_SWITCH_TIMEOUT";
+const char *FAULTY_HEATER_WAS_ON_STRING = "FAULTY_HEATER_WAS_ON";
 const char *MAIN_SWITCH_ON_TIMEOUT_STRING = "MAIN_SWITCH_ON_TIMEOUT";
 const char *MAIN_SWITCH_OFF_TIMEOUT_STRING = "MAIN_SWITCH_OFF_TIMEOUT";
 const char *DEPLOYMENT_FAILED_STRING = "DEPLOYMENT_FAILED";
@@ -386,6 +387,8 @@ const char *translateEvents(Event event) {
       return SWITCH_ALREADY_OFF_STRING;
     case (11406):
       return MAIN_SWITCH_TIMEOUT_STRING;
+    case (11407):
+      return FAULTY_HEATER_WAS_ON_STRING;
     case (11500):
       return MAIN_SWITCH_ON_TIMEOUT_STRING;
     case (11501):
diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp
index 0b7f0314..fcc2c875 100644
--- a/generators/objects/translateObjects.cpp
+++ b/generators/objects/translateObjects.cpp
@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 129 translations.
- * Generated on: 2022-05-12 14:08:08
+ * Generated on: 2022-05-12 20:45:27
  */
 #include "translateObjects.h"
 
diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp
index 7cf4646b..08283d78 100644
--- a/linux/fsfwconfig/events/translateEvents.cpp
+++ b/linux/fsfwconfig/events/translateEvents.cpp
@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 202 translations.
+ * @brief    Auto-generated event translation file. Contains 203 translations.
  * @details
- * Generated on: 2022-05-12 14:08:08
+ * Generated on: 2022-05-12 20:45:27
  */
 #include "translateEvents.h"
 
@@ -95,6 +95,7 @@ const char *HEATER_WENT_OFF_STRING = "HEATER_WENT_OFF";
 const char *SWITCH_ALREADY_ON_STRING = "SWITCH_ALREADY_ON";
 const char *SWITCH_ALREADY_OFF_STRING = "SWITCH_ALREADY_OFF";
 const char *MAIN_SWITCH_TIMEOUT_STRING = "MAIN_SWITCH_TIMEOUT";
+const char *FAULTY_HEATER_WAS_ON_STRING = "FAULTY_HEATER_WAS_ON";
 const char *MAIN_SWITCH_ON_TIMEOUT_STRING = "MAIN_SWITCH_ON_TIMEOUT";
 const char *MAIN_SWITCH_OFF_TIMEOUT_STRING = "MAIN_SWITCH_OFF_TIMEOUT";
 const char *DEPLOYMENT_FAILED_STRING = "DEPLOYMENT_FAILED";
@@ -386,6 +387,8 @@ const char *translateEvents(Event event) {
       return SWITCH_ALREADY_OFF_STRING;
     case (11406):
       return MAIN_SWITCH_TIMEOUT_STRING;
+    case (11407):
+      return FAULTY_HEATER_WAS_ON_STRING;
     case (11500):
       return MAIN_SWITCH_ON_TIMEOUT_STRING;
     case (11501):
diff --git a/linux/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp
index 0b7f0314..fcc2c875 100644
--- a/linux/fsfwconfig/objects/translateObjects.cpp
+++ b/linux/fsfwconfig/objects/translateObjects.cpp
@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 129 translations.
- * Generated on: 2022-05-12 14:08:08
+ * Generated on: 2022-05-12 20:45:27
  */
 #include "translateObjects.h"
 
diff --git a/tmtc b/tmtc
index 8e20c2ab..743670f6 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 8e20c2ab0879e5b483308d0feb4aeb5951ce00c9
+Subproject commit 743670f6563d5713c883545186ef1c7a47784d1a