diff --git a/companion/src/modeledit/telemetry.ui b/companion/src/modeledit/telemetry.ui
index 0709dc70d..b365f7f1b 100644
--- a/companion/src/modeledit/telemetry.ui
+++ b/companion/src/modeledit/telemetry.ui
@@ -62,7 +62,16 @@
       <bool>false</bool>
      </property>
      <layout class="QGridLayout" name="rssiLayout" columnstretch="0,0,1">
-      <property name="margin">
+      <property name="leftMargin">
+       <number>4</number>
+      </property>
+      <property name="topMargin">
+       <number>4</number>
+      </property>
+      <property name="rightMargin">
+       <number>4</number>
+      </property>
+      <property name="bottomMargin">
        <number>4</number>
       </property>
       <item row="2" column="0">
@@ -269,7 +278,16 @@
       <bool>false</bool>
      </property>
      <layout class="QVBoxLayout" name="A1Layout">
-      <property name="margin">
+      <property name="leftMargin">
+       <number>4</number>
+      </property>
+      <property name="topMargin">
+       <number>4</number>
+      </property>
+      <property name="rightMargin">
+       <number>4</number>
+      </property>
+      <property name="bottomMargin">
        <number>4</number>
       </property>
       <item>
@@ -294,7 +312,16 @@
       <bool>false</bool>
      </property>
      <layout class="QVBoxLayout" name="A2Layout">
-      <property name="margin">
+      <property name="leftMargin">
+       <number>4</number>
+      </property>
+      <property name="topMargin">
+       <number>4</number>
+      </property>
+      <property name="rightMargin">
+       <number>4</number>
+      </property>
+      <property name="bottomMargin">
        <number>4</number>
       </property>
       <item>
@@ -322,7 +349,16 @@
       </sizepolicy>
      </property>
      <layout class="QGridLayout" name="gridLayout_39">
-      <property name="margin">
+      <property name="leftMargin">
+       <number>4</number>
+      </property>
+      <property name="topMargin">
+       <number>4</number>
+      </property>
+      <property name="rightMargin">
+       <number>4</number>
+      </property>
+      <property name="bottomMargin">
        <number>4</number>
       </property>
       <property name="spacing">
@@ -571,7 +607,16 @@
       </sizepolicy>
      </property>
      <layout class="QGridLayout" name="gridLayout_40">
-      <property name="margin">
+      <property name="leftMargin">
+       <number>4</number>
+      </property>
+      <property name="topMargin">
+       <number>4</number>
+      </property>
+      <property name="rightMargin">
+       <number>4</number>
+      </property>
+      <property name="bottomMargin">
        <number>4</number>
       </property>
       <property name="spacing">
@@ -642,7 +687,16 @@
       </sizepolicy>
      </property>
      <layout class="QGridLayout" name="gridLayout_6">
-      <property name="margin">
+      <property name="leftMargin">
+       <number>4</number>
+      </property>
+      <property name="topMargin">
+       <number>4</number>
+      </property>
+      <property name="rightMargin">
+       <number>4</number>
+      </property>
+      <property name="bottomMargin">
        <number>4</number>
       </property>
       <property name="spacing">
@@ -893,7 +947,16 @@
       <bool>false</bool>
      </property>
      <layout class="QGridLayout" name="sensorsLayout" columnstretch="0">
-      <property name="margin">
+      <property name="leftMargin">
+       <number>4</number>
+      </property>
+      <property name="topMargin">
+       <number>4</number>
+      </property>
+      <property name="rightMargin">
+       <number>4</number>
+      </property>
+      <property name="bottomMargin">
        <number>4</number>
       </property>
       <item row="1" column="0">
diff --git a/radio/src/gui/9X/menu_model_telemetry.cpp b/radio/src/gui/9X/menu_model_telemetry.cpp
index 80f87b938..837f85b0d 100644
--- a/radio/src/gui/9X/menu_model_telemetry.cpp
+++ b/radio/src/gui/9X/menu_model_telemetry.cpp
@@ -86,8 +86,10 @@ enum menuModelTelemetryItems {
   ITEM_TELEMETRY_SENSOR30,
   ITEM_TELEMETRY_SENSOR31,
   ITEM_TELEMETRY_SENSOR32,
-  ITEM_TELEMETRY_NEWSENSOR,
-  ITEM_TELEMETRY_IGNORE_SENSORID,
+  ITEM_TELEMETRY_DISCOVER_SENSORS,
+  ITEM_TELEMETRY_NEW_SENSOR,
+  ITEM_TELEMETRY_DELETE_ALL_SENSORS,
+  ITEM_TELEMETRY_IGNORE_SENSOR_INSTANCE,
 #endif
 #if !defined(CPUARM)
 #if defined(FRSKY_HUB) || defined(WS_HOW_HIGH)
@@ -132,30 +134,30 @@ enum menuModelTelemetryItems {
 };
 
 #if defined(FRSKY)
-  #define TELEM_COL1        INDENT_WIDTH
+  #define TELEM_COL1                   INDENT_WIDTH
   #if defined(TRANSLATIONS_FR) || defined(TRANSLATIONS_CZ)
-    #define TELEM_COL2      (9*FW)
+    #define TELEM_COL2                 (9*FW)
   #else
-    #define TELEM_COL2      (8*FW)
+    #define TELEM_COL2                 (8*FW)
   #endif
-  #define TELEM_BARS_COLMIN (56-3*FW)
-  #define TELEM_BARS_COLMAX (14*FW-3)
-  #define TELEM_SCRTYPE_COL TELEM_COL2
+  #define TELEM_BARS_COLMIN            (56-3*FW)
+  #define TELEM_BARS_COLMAX            (14*FW-3)
+  #define TELEM_SCRTYPE_COL            TELEM_COL2
 
-#define IS_RANGE_DEFINED(k) (g_model.frsky.channels[k].ratio > 0)
+#define IS_RANGE_DEFINED(k)            (g_model.frsky.channels[k].ratio > 0)
 
 #if defined(CPUARM)
   #define CHANNELS_ROWS
-  #define SENSOR_ROWS(x)    (isTelemetryFieldAvailable(x) ? (uint8_t)0 : HIDDEN_ROW)
-  #define SENSORS_ROWS      LABEL(Sensors), SENSOR_ROWS(0), SENSOR_ROWS(1), SENSOR_ROWS(2), SENSOR_ROWS(3), SENSOR_ROWS(4), SENSOR_ROWS(5), SENSOR_ROWS(6), SENSOR_ROWS(7), SENSOR_ROWS(8), SENSOR_ROWS(9), SENSOR_ROWS(10), SENSOR_ROWS(11), SENSOR_ROWS(12), SENSOR_ROWS(13), SENSOR_ROWS(14), SENSOR_ROWS(15), SENSOR_ROWS(16), SENSOR_ROWS(17), SENSOR_ROWS(18), SENSOR_ROWS(19), SENSOR_ROWS(20), SENSOR_ROWS(21), SENSOR_ROWS(22), SENSOR_ROWS(23), SENSOR_ROWS(24), SENSOR_ROWS(25), SENSOR_ROWS(26), SENSOR_ROWS(27), SENSOR_ROWS(28), SENSOR_ROWS(29), SENSOR_ROWS(30), SENSOR_ROWS(31), 0, 0,
+  #define SENSOR_ROWS(x)               (isTelemetryFieldAvailable(x) ? (uint8_t)0 : HIDDEN_ROW)
+  #define SENSORS_ROWS                 LABEL(Sensors), SENSOR_ROWS(0), SENSOR_ROWS(1), SENSOR_ROWS(2), SENSOR_ROWS(3), SENSOR_ROWS(4), SENSOR_ROWS(5), SENSOR_ROWS(6), SENSOR_ROWS(7), SENSOR_ROWS(8), SENSOR_ROWS(9), SENSOR_ROWS(10), SENSOR_ROWS(11), SENSOR_ROWS(12), SENSOR_ROWS(13), SENSOR_ROWS(14), SENSOR_ROWS(15), SENSOR_ROWS(16), SENSOR_ROWS(17), SENSOR_ROWS(18), SENSOR_ROWS(19), SENSOR_ROWS(20), SENSOR_ROWS(21), SENSOR_ROWS(22), SENSOR_ROWS(23), SENSOR_ROWS(24), SENSOR_ROWS(25), SENSOR_ROWS(26), SENSOR_ROWS(27), SENSOR_ROWS(28), SENSOR_ROWS(29), SENSOR_ROWS(30), SENSOR_ROWS(31), 0, 0, 0, 0,
 #else
-  #define CHANNEL_ROWS(x)   LABEL(CHANNEL), 1, 0, 2, 2
-  #define CHANNELS_ROWS     CHANNEL_ROWS(0), CHANNEL_ROWS(1),
+  #define CHANNEL_ROWS(x)              LABEL(CHANNEL), 1, 0, 2, 2
+  #define CHANNELS_ROWS                CHANNEL_ROWS(0), CHANNEL_ROWS(1),
   #define SENSORS_ROWS
 #endif
 
 #if defined(FAS_OFFSET) || !defined(CPUM64)
-  #define IF_FAS_OFFSET(x)  x,
+  #define IF_FAS_OFFSET(x)             x,
 #else
   #define IF_FAS_OFFSET(x)
 #endif
@@ -163,38 +165,38 @@ enum menuModelTelemetryItems {
 #if defined(CPUARM)
   #define USRDATA_ROWS
 #elif defined(FRSKY_HUB) || defined(WS_HOW_HIGH)
-  #define USRDATA_ROWS      LABEL(UsrData), 0, 0, 0, 0, IF_FAS_OFFSET(0)
+  #define USRDATA_ROWS                 LABEL(UsrData), 0, 0, 0, 0, IF_FAS_OFFSET(0)
 #else
-  #define USRDATA_ROWS      0, 0, IF_FAS_OFFSET(0)
+  #define USRDATA_ROWS                 0, 0, IF_FAS_OFFSET(0)
 #endif
 
-#define RSSI_ROWS         LABEL(RSSI), 1, 1,
+#define RSSI_ROWS                      LABEL(RSSI), 1, 1,
 
 #if defined(CPUARM) || defined(GAUGES)
-  #define SCREEN_TYPE_ROWS  0
+  #define SCREEN_TYPE_ROWS             0
 #else
-  #define SCREEN_TYPE_ROWS  LABEL(SCREEN)
+  #define SCREEN_TYPE_ROWS             LABEL(SCREEN)
 #endif
 
 #if defined(PCBSTD)
-  #define VARIO_RANGE_ROWS  1
+  #define VARIO_RANGE_ROWS             1
 #else
-  #define VARIO_RANGE_ROWS  3
+  #define VARIO_RANGE_ROWS             3
 #endif
 
 #if defined(CPUARM)
-  #define TELEMETRY_TYPE_ROWS  0,
+  #define TELEMETRY_TYPE_ROWS          0,
 #else
   #define TELEMETRY_TYPE_ROWS
 #endif
 
 #if defined(CPUARM)
-  #define TELEMETRY_SCREEN_LINE(x) (TELEMETRY_SCREEN_TYPE(x) == TELEMETRY_SCREEN_TYPE_NONE ? HIDDEN_ROW : (uint8_t)2)
-  #define TELEMETRY_SCREEN_ROWS(x) SCREEN_TYPE_ROWS, TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x)
-  #define TELEMETRY_CURRENT_EDIT_SCREEN(k) (k < ITEM_TELEMETRY_SCREEN_LABEL2 ? 0 : (k < ITEM_TELEMETRY_SCREEN_LABEL3 ? 1 : (k < ITEM_TELEMETRY_SCREEN_LABEL4 ? 2 : 3)))
+  #define TELEMETRY_SCREEN_LINE(x)     (TELEMETRY_SCREEN_TYPE(x) == TELEMETRY_SCREEN_TYPE_NONE ? HIDDEN_ROW : (uint8_t)2)
+  #define TELEMETRY_SCREEN_ROWS(x)     SCREEN_TYPE_ROWS, TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x)
+  #define TELEMETRY_CURRENT_SCREEN(k)  (k < ITEM_TELEMETRY_SCREEN_LABEL2 ? 0 : (k < ITEM_TELEMETRY_SCREEN_LABEL3 ? 1 : (k < ITEM_TELEMETRY_SCREEN_LABEL4 ? 2 : 3)))
 #else
-  #define TELEMETRY_SCREEN_ROWS(x) SCREEN_TYPE_ROWS, 2, 2, 2, 2
-  #define TELEMETRY_CURRENT_EDIT_CHANNEL(k) (k >= ITEM_TELEMETRY_A2_LABEL ? TELEM_ANA_A2 : TELEM_ANA_A1)
+  #define TELEMETRY_SCREEN_ROWS(x)     SCREEN_TYPE_ROWS, 2, 2, 2, 2
+  #define TELEMETRY_CURRENT_CHANNEL(k) (k >= ITEM_TELEMETRY_A2_LABEL ? TELEM_ANA_A2 : TELEM_ANA_A1)
 #endif
 
 #if defined(CPUARM)
@@ -497,7 +499,7 @@ void onSensorMenu(const char *result)
       if (index<MAX_SENSORS && isTelemetryFieldAvailable(index))
         m_posVert += 1;
       else
-        m_posVert = 1+ITEM_TELEMETRY_NEWSENSOR;
+        m_posVert = 1+ITEM_TELEMETRY_NEW_SENSOR;
     }
     else if (result == STR_COPY) {
       int newIndex = availableTelemetryIndex();
@@ -521,6 +523,15 @@ void onSensorMenu(const char *result)
 
 void menuModelTelemetry(uint8_t event)
 {
+#if defined(CPUARM)
+  if (s_warning_result) {
+    s_warning_result = 0;
+    for (int i=0; i<MAX_SENSORS; i++) {
+      delTelemetryIndex(i);
+    }
+  }
+#endif
+
   MENU(STR_MENUTELEMETRY, menuTabModel, e_Telemetry, ITEM_TELEMETRY_MAX+1, {0, TELEMETRY_TYPE_ROWS CHANNELS_ROWS RSSI_ROWS SENSORS_ROWS USRDATA_ROWS CASE_VARIO(LABEL(Vario)) CASE_VARIO(0) CASE_VARIO(VARIO_RANGE_ROWS) TELEMETRY_SCREEN_ROWS(0), TELEMETRY_SCREEN_ROWS(1), CASE_CPUARM(TELEMETRY_SCREEN_ROWS(2)) CASE_CPUARM(TELEMETRY_SCREEN_ROWS(3))});
 
   uint8_t sub = m_posVert - 1;
@@ -549,7 +560,7 @@ void menuModelTelemetry(uint8_t event)
     uint8_t attr = (sub == k ? blink : 0);
 
 #if !defined(CPUARM)
-    uint8_t ch = TELEMETRY_CURRENT_EDIT_CHANNEL(k);
+    uint8_t ch = TELEMETRY_CURRENT_CHANNEL(k);
     FrSkyChannelData & channel = g_model.frsky.channels[ch];
     uint8_t dest = TELEM_A1-1+ch;
 #endif
@@ -604,7 +615,15 @@ void menuModelTelemetry(uint8_t event)
         lcd_putsLeft(y, STR_TELEMETRY_SENSORS);
         break;
 
-      case ITEM_TELEMETRY_NEWSENSOR:
+      case ITEM_TELEMETRY_DISCOVER_SENSORS:
+        lcd_putsAtt(0, y, allowNewSensors ? STR_STOP_DISCOVER_SENSORS : STR_DISCOVER_SENSORS, attr);
+        if (attr && event==EVT_KEY_BREAK(KEY_ENTER)) {
+          s_editMode = 0;
+          allowNewSensors = !allowNewSensors;
+        }
+        break;
+
+      case ITEM_TELEMETRY_NEW_SENSOR:
         lcd_putsAtt(0, y, STR_TELEMETRY_NEWSENSOR, attr);
         if (attr && event==EVT_KEY_BREAK(KEY_ENTER)) {
           s_editMode = 0;
@@ -618,9 +637,18 @@ void menuModelTelemetry(uint8_t event)
           }
         }
         break;
-  
-      case ITEM_TELEMETRY_IGNORE_SENSORID:
-        ON_OFF_MENU_ITEM(g_model.ignoreSensorIds, TELEM_COL2, y, STR_IGNOREIDS, attr, event);
+
+      case ITEM_TELEMETRY_DELETE_ALL_SENSORS:
+        lcd_putsAtt(0, y, STR_DELETE_ALL_SENSORS, attr);
+        s_editMode = 0;
+        if (attr && event==EVT_KEY_LONG(KEY_ENTER)) {
+          killEvents(KEY_ENTER);
+          POPUP_CONFIRMATION(STR_CONFIRMDELETE);
+        }
+        break;       
+
+      case ITEM_TELEMETRY_IGNORE_SENSOR_INSTANCE:
+        ON_OFF_MENU_ITEM(g_model.ignoreSensorIds, TELEM_COL2, y, STR_IGNORE_INSTANCE, attr, event);
         break;
 #endif
 
@@ -830,7 +858,7 @@ void menuModelTelemetry(uint8_t event)
       case ITEM_TELEMETRY_SCREEN_LABEL3:
       case ITEM_TELEMETRY_SCREEN_LABEL4:
       {
-        uint8_t screenIndex = TELEMETRY_CURRENT_EDIT_SCREEN(k);
+        uint8_t screenIndex = TELEMETRY_CURRENT_SCREEN(k);
         putsStrIdx(0*FW, y, STR_SCREEN, screenIndex+1);
         TelemetryScreenType oldScreenType = TELEMETRY_SCREEN_TYPE(screenIndex);
         TelemetryScreenType newScreenType = (TelemetryScreenType)selectMenuItem(TELEM_SCRTYPE_COL, y, PSTR(""), STR_VTELEMSCREENTYPE, oldScreenType, 0, TELEMETRY_SCREEN_TYPE_MAX, (m_posHorz==0 ? attr : 0), event);
diff --git a/radio/src/gui/Taranis/menu_model_telemetry.cpp b/radio/src/gui/Taranis/menu_model_telemetry.cpp
index 21578d131..8eea1b51f 100644
--- a/radio/src/gui/Taranis/menu_model_telemetry.cpp
+++ b/radio/src/gui/Taranis/menu_model_telemetry.cpp
@@ -73,8 +73,10 @@ enum menuModelTelemetryItems {
   ITEM_TELEMETRY_SENSOR30,
   ITEM_TELEMETRY_SENSOR31,
   ITEM_TELEMETRY_SENSOR32,
-  ITEM_TELEMETRY_NEWSENSOR,
-  ITEM_TELEMETRY_IGNORE_SENSORID,
+  ITEM_TELEMETRY_DISCOVER_SENSORS,
+  ITEM_TELEMETRY_NEW_SENSOR,
+  ITEM_TELEMETRY_DELETE_ALL_SENSORS,
+  ITEM_TELEMETRY_IGNORE_SENSOR_INSTANCE,
 #if defined(VARIO)
   ITEM_TELEMETRY_VARIO_LABEL,
   ITEM_TELEMETRY_VARIO_SOURCE,
@@ -110,39 +112,39 @@ enum menuModelTelemetryItems {
   ITEM_TELEMETRY_MAX
 };
 
-#define TELEM_COL1        (1*FW)
-#define TELEM_COL2        (16*FW)
-#define TELEM_COL3        (28*FW)
-#define TELEM_BARS_COLMIN TELEM_COL2
-#define TELEM_BARS_COLMAX TELEM_COL3
-#define TELEM_SCRTYPE_COL TELEM_COL2
+#define TELEM_COL1                    (1*FW)
+#define TELEM_COL2                    (16*FW)
+#define TELEM_COL3                    (28*FW)
+#define TELEM_BARS_COLMIN             TELEM_COL2
+#define TELEM_BARS_COLMAX             TELEM_COL3
+#define TELEM_SCRTYPE_COL             TELEM_COL2
 
-#define IF_FAS_OFFSET(x)  x,
-#define IS_RANGE_DEFINED(k) (g_model.frsky.channels[k].ratio > 0)
+#define IF_FAS_OFFSET(x)              x,
+#define IS_RANGE_DEFINED(k)           (g_model.frsky.channels[k].ratio > 0)
 
-#define SENSOR_ROWS(x)    (isTelemetryFieldAvailable(x) ? (uint8_t)0 : HIDDEN_ROW)
-#define SENSORS_ROWS      LABEL(Sensors), SENSOR_ROWS(0), SENSOR_ROWS(1), SENSOR_ROWS(2), SENSOR_ROWS(3), SENSOR_ROWS(4), SENSOR_ROWS(5), SENSOR_ROWS(6), SENSOR_ROWS(7), SENSOR_ROWS(8), SENSOR_ROWS(9), SENSOR_ROWS(10), SENSOR_ROWS(11), SENSOR_ROWS(12), SENSOR_ROWS(13), SENSOR_ROWS(14), SENSOR_ROWS(15), SENSOR_ROWS(16), SENSOR_ROWS(17), SENSOR_ROWS(18), SENSOR_ROWS(19), SENSOR_ROWS(20), SENSOR_ROWS(21), SENSOR_ROWS(22), SENSOR_ROWS(23), SENSOR_ROWS(24), SENSOR_ROWS(25), SENSOR_ROWS(26), SENSOR_ROWS(27), SENSOR_ROWS(28), SENSOR_ROWS(29), SENSOR_ROWS(30), SENSOR_ROWS(31), 0, 0,
+#define SENSOR_ROWS(x)                (isTelemetryFieldAvailable(x) ? (uint8_t)0 : HIDDEN_ROW)
+#define SENSORS_ROWS                  LABEL(Sensors), SENSOR_ROWS(0), SENSOR_ROWS(1), SENSOR_ROWS(2), SENSOR_ROWS(3), SENSOR_ROWS(4), SENSOR_ROWS(5), SENSOR_ROWS(6), SENSOR_ROWS(7), SENSOR_ROWS(8), SENSOR_ROWS(9), SENSOR_ROWS(10), SENSOR_ROWS(11), SENSOR_ROWS(12), SENSOR_ROWS(13), SENSOR_ROWS(14), SENSOR_ROWS(15), SENSOR_ROWS(16), SENSOR_ROWS(17), SENSOR_ROWS(18), SENSOR_ROWS(19), SENSOR_ROWS(20), SENSOR_ROWS(21), SENSOR_ROWS(22), SENSOR_ROWS(23), SENSOR_ROWS(24), SENSOR_ROWS(25), SENSOR_ROWS(26), SENSOR_ROWS(27), SENSOR_ROWS(28), SENSOR_ROWS(29), SENSOR_ROWS(30), SENSOR_ROWS(31), 0, 0, 0, 0,
 #if defined(VARIO)
-  #define VARIO_ROWS      LABEL(Vario), 0, 1, 2,
+  #define VARIO_ROWS                  LABEL(Vario), 0, 1, 2,
 #else
   #define VARIO_ROWS
 #endif
-#define RSSI_ROWS         LABEL(RSSI), 0, 0,
+#define RSSI_ROWS                     LABEL(RSSI), 0, 0,
 #if defined(LUA)
-  #define SCREEN_TYPE_ROWS  1
+  #define SCREEN_TYPE_ROWS            1
 #else
-  #define SCREEN_TYPE_ROWS  0
+  #define SCREEN_TYPE_ROWS            0
 #endif
-#define VARIO_RANGE_ROWS  3
-#define TELEMETRY_TYPE_ROWS  (g_model.moduleData[INTERNAL_MODULE].rfProtocol == RF_PROTO_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PPM) ? (uint8_t)0 : HIDDEN_ROW,
+#define VARIO_RANGE_ROWS              3
+#define TELEMETRY_TYPE_ROWS           (g_model.moduleData[INTERNAL_MODULE].rfProtocol == RF_PROTO_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PPM) ? (uint8_t)0 : HIDDEN_ROW,
 
 #if defined(LUA)
-  #define TELEMETRY_SCREEN_LINE(x) ((TELEMETRY_SCREEN_TYPE(x) == TELEMETRY_SCREEN_TYPE_NONE || TELEMETRY_SCREEN_TYPE(x) == TELEMETRY_SCREEN_TYPE_SCRIPT) ? HIDDEN_ROW : (uint8_t)2)
+  #define TELEMETRY_SCREEN_LINE(x)    ((TELEMETRY_SCREEN_TYPE(x) == TELEMETRY_SCREEN_TYPE_NONE || TELEMETRY_SCREEN_TYPE(x) == TELEMETRY_SCREEN_TYPE_SCRIPT) ? HIDDEN_ROW : (uint8_t)2)
 #else
-  #define TELEMETRY_SCREEN_LINE(x) (TELEMETRY_SCREEN_TYPE(x) == TELEMETRY_SCREEN_TYPE_NONE ? HIDDEN_ROW : (uint8_t)2)
+  #define TELEMETRY_SCREEN_LINE(x)    (TELEMETRY_SCREEN_TYPE(x) == TELEMETRY_SCREEN_TYPE_NONE ? HIDDEN_ROW : (uint8_t)2)
 #endif
-#define TELEMETRY_SCREEN_ROWS(x) SCREEN_TYPE_ROWS, TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x)
-#define TELEMETRY_CURRENT_EDIT_SCREEN(k) (k < ITEM_TELEMETRY_SCREEN_LABEL2 ? 0 : (k < ITEM_TELEMETRY_SCREEN_LABEL3 ? 1 : (k < ITEM_TELEMETRY_SCREEN_LABEL4 ? 2 : 3)))
+#define TELEMETRY_SCREEN_ROWS(x)      SCREEN_TYPE_ROWS, TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x), TELEMETRY_SCREEN_LINE(x)
+#define TELEMETRY_CURRENT_SCREEN(k)   (k < ITEM_TELEMETRY_SCREEN_LABEL2 ? 0 : (k < ITEM_TELEMETRY_SCREEN_LABEL3 ? 1 : (k < ITEM_TELEMETRY_SCREEN_LABEL4 ? 2 : 3)))
 
 enum SensorFields {
   SENSOR_FIELD_NAME,
@@ -467,7 +469,7 @@ void onSensorMenu(const char *result)
       if (index<MAX_SENSORS && isTelemetryFieldAvailable(index))
         m_posVert += 1;
       else
-        m_posVert = ITEM_TELEMETRY_NEWSENSOR;
+        m_posVert = ITEM_TELEMETRY_NEW_SENSOR;
     }
     else if (result == STR_COPY) {
       int newIndex = availableTelemetryIndex();
@@ -492,7 +494,7 @@ void onSensorMenu(const char *result)
 void onTelemetryScriptFileSelectionMenu(const char *result)
 {
   int sub = m_posVert;
-  int screenIndex = TELEMETRY_CURRENT_EDIT_SCREEN(sub);
+  int screenIndex = TELEMETRY_CURRENT_SCREEN(sub);
 
   if (result == STR_UPDATE_LIST) {
     if (!listSdFiles(SCRIPTS_TELEM_PATH, SCRIPTS_EXT, sizeof(g_model.frsky.screens[screenIndex].script.file), NULL)) {
@@ -517,6 +519,13 @@ void onTelemetryScriptFileSelectionMenu(const char *result)
 
 void menuModelTelemetry(uint8_t event)
 {
+  if (s_warning_result) {
+    s_warning_result = 0;
+    for (int i=0; i<MAX_SENSORS; i++) {
+      delTelemetryIndex(i);
+    }
+  }
+  
   MENU(STR_MENUTELEMETRY, menuTabModel, e_Telemetry, ITEM_TELEMETRY_MAX, { TELEMETRY_TYPE_ROWS RSSI_ROWS SENSORS_ROWS VARIO_ROWS LABEL(TopBar), 0, 0, TOPLCD_ROWS TELEMETRY_SCREEN_ROWS(0), TELEMETRY_SCREEN_ROWS(1), CASE_CPUARM(TELEMETRY_SCREEN_ROWS(2)) CASE_CPUARM(TELEMETRY_SCREEN_ROWS(3)) });
 
   int sub = m_posVert;
@@ -585,7 +594,15 @@ void menuModelTelemetry(uint8_t event)
         }
         break;
 
-      case ITEM_TELEMETRY_NEWSENSOR:
+      case ITEM_TELEMETRY_DISCOVER_SENSORS:
+        lcd_putsAtt(0, y, allowNewSensors ? STR_STOP_DISCOVER_SENSORS : STR_DISCOVER_SENSORS, attr);
+        if (attr && event==EVT_KEY_BREAK(KEY_ENTER)) {
+          s_editMode = 0;
+          allowNewSensors = !allowNewSensors;
+        }
+        break;
+
+      case ITEM_TELEMETRY_NEW_SENSOR:
         lcd_putsAtt(0, y, STR_TELEMETRY_NEWSENSOR, attr);
         if (attr && event==EVT_KEY_BREAK(KEY_ENTER)) {
           s_editMode = 0;
@@ -600,8 +617,17 @@ void menuModelTelemetry(uint8_t event)
         }
         break;
 
-      case ITEM_TELEMETRY_IGNORE_SENSORID:
-        ON_OFF_MENU_ITEM(g_model.ignoreSensorIds, TELEM_COL2, y, STR_IGNOREIDS, attr, event);
+      case ITEM_TELEMETRY_DELETE_ALL_SENSORS:
+        lcd_putsAtt(0, y, STR_DELETE_ALL_SENSORS, attr);
+        s_editMode = 0;
+        if (attr && event==EVT_KEY_LONG(KEY_ENTER)) {
+          killEvents(KEY_ENTER);
+          POPUP_CONFIRMATION(STR_CONFIRMDELETE);
+        }
+        break;        
+
+      case ITEM_TELEMETRY_IGNORE_SENSOR_INSTANCE:
+        ON_OFF_MENU_ITEM(g_model.ignoreSensorIds, TELEM_COL2, y, STR_IGNORE_INSTANCE, attr, event);
         break;
 
       case ITEM_TELEMETRY_RSSI_LABEL:
@@ -705,7 +731,7 @@ void menuModelTelemetry(uint8_t event)
       case ITEM_TELEMETRY_SCREEN_LABEL3:
       case ITEM_TELEMETRY_SCREEN_LABEL4:
       {
-        uint8_t screenIndex = TELEMETRY_CURRENT_EDIT_SCREEN(k);
+        uint8_t screenIndex = TELEMETRY_CURRENT_SCREEN(k);
         putsStrIdx(0*FW, y, STR_SCREEN, screenIndex+1);
         TelemetryScreenType oldScreenType = TELEMETRY_SCREEN_TYPE(screenIndex);
         TelemetryScreenType newScreenType = (TelemetryScreenType)selectMenuItem(TELEM_SCRTYPE_COL, y, PSTR(""), STR_VTELEMSCREENTYPE, oldScreenType, 0, TELEMETRY_SCREEN_TYPE_MAX, (m_posHorz==0 ? attr : 0), event);
diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
index 0dfb176e9..81c43af60 100644
--- a/radio/src/myeeprom.h
+++ b/radio/src/myeeprom.h
@@ -2157,8 +2157,9 @@ PACK(typedef struct {
   FlightModeData flightModeData[MAX_FLIGHT_MODES];
 
   AVR_FIELD(int8_t ppmFrameLength)     // 0=22.5ms  (10ms-30ms) 0.5ms increments
-  uint8_t   thrTraceSrc;
-  
+
+  uint8_t thrTraceSrc;
+
   swarnstate_t  switchWarningState;
   swarnenable_t switchWarningEnable;
 
diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp
index 2c85a702d..872e389c2 100644
--- a/radio/src/telemetry/telemetry.cpp
+++ b/radio/src/telemetry/telemetry.cpp
@@ -1,6 +1,7 @@
 #include "../opentx.h"
 
 TelemetryItem telemetryItems[MAX_SENSORS];
+uint8_t allowNewSensors;
 
 void TelemetryItem::gpsReceived()
 {
@@ -491,11 +492,11 @@ void setTelemetryValue(TelemetryProtocol protocol, uint16_t id, uint8_t instance
     if (telemetrySensor.type == TELEM_TYPE_CUSTOM && telemetrySensor.id == id && (telemetrySensor.instance == instance || g_model.ignoreSensorIds)) {
       telemetryItems[index].setValue(telemetrySensor, value, unit, prec);
       available = true;
-      // we continue search here, because more than one sensor can have the same id and instance
+      // we continue search here, because sensors can share the same id and instance
     }
   }
 
-  if (available) {
+  if (available || !allowNewSensors) {
     return;
   }
   
diff --git a/radio/src/telemetry/telemetry.h b/radio/src/telemetry/telemetry.h
index 37e89e492..5885f95bd 100644
--- a/radio/src/telemetry/telemetry.h
+++ b/radio/src/telemetry/telemetry.h
@@ -165,6 +165,7 @@ class TelemetryItem
 };
 
 extern TelemetryItem telemetryItems[MAX_SENSORS];
+extern uint8_t allowNewSensors;
 
 inline bool isTelemetryFieldAvailable(int index)
 {
diff --git a/radio/src/tests/frsky.cpp b/radio/src/tests/frsky.cpp
index 2db052dcd..c82109319 100644
--- a/radio/src/tests/frsky.cpp
+++ b/radio/src/tests/frsky.cpp
@@ -129,6 +129,8 @@ TEST(FrSky, Vfas_0x39_HiPrecision)
   TELEMETRY_RESET();
   EXPECT_EQ(telemetryItems[0].value, 0);
 
+  allowNewSensors = true;
+
   // normal precision, resolution 0.1V
   processHubPacket(VFAS_ID, 1234);  // set value of 123.4V
   EXPECT_EQ(telemetryItems[0].value, 12340);      // stored value has resolution of 0.01V
@@ -148,6 +150,8 @@ TEST(FrSky, HubAltNegative)
   TELEMETRY_RESET();
   EXPECT_EQ(telemetryItems[0].value, 0);
 
+  allowNewSensors = true;
+
   // altimeter auto offset
   processHubPacket(BARO_ALT_BP_ID, 0);
   processHubPacket(BARO_ALT_AP_ID, 0);
diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp
index febcbb99c..efe86b04e 100644
--- a/radio/src/translations.cpp
+++ b/radio/src/translations.cpp
@@ -570,7 +570,11 @@ const pm_char STR_BLCOLOR[]  PROGMEM = TR_BLCOLOR;
   const pm_char STR_ONLYPOSITIVE[] PROGMEM = TR_ONLYPOSITIVE;
   const pm_char STR_FILTER[] PROGMEM = TR_FILTER;
   const pm_char STR_TELEMETRYFULL[] PROGMEM = TR_TELEMETRYFULL;
-  const pm_char STR_IGNOREIDS[] PROGMEM = TR_IGNOREIDS;
+  const pm_char STR_IGNORE_INSTANCE[] PROGMEM = TR_IGNORE_INSTANCE;
+  const pm_char STR_DISCOVER_SENSORS[] PROGMEM = TR_DISCOVER_SENSORS;
+  const pm_char STR_STOP_DISCOVER_SENSORS[] PROGMEM = TR_STOP_DISCOVER_SENSORS;
+  const pm_char STR_DELETE_ALL_SENSORS[] PROGMEM = TR_DELETE_ALL_SENSORS;
+  const pm_char STR_CONFIRMDELETE[] PROGMEM = TR_CONFIRMDELETE;
 #endif
 
 #if defined(PCBTARANIS)
diff --git a/radio/src/translations.h b/radio/src/translations.h
index 651a0fe13..15bbb1cfe 100644
--- a/radio/src/translations.h
+++ b/radio/src/translations.h
@@ -789,7 +789,11 @@ extern const pm_char STR_BLCOLOR[];
   extern const pm_char STR_ONLYPOSITIVE[];
   extern const pm_char STR_FILTER[];
   extern const pm_char STR_TELEMETRYFULL[];
-  extern const pm_char STR_IGNOREIDS[];
+  extern const pm_char STR_IGNORE_INSTANCE[];
+  extern const pm_char STR_DISCOVER_SENSORS[];
+  extern const pm_char STR_STOP_DISCOVER_SENSORS[];
+  extern const pm_char STR_DELETE_ALL_SENSORS[];
+  extern const pm_char STR_CONFIRMDELETE[];
 #endif
 
 #if defined(PCBTARANIS)
diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt
index a77da1369..431c250c5 100644
--- a/radio/src/translations/cz.h.txt
+++ b/radio/src/translations/cz.h.txt
@@ -1079,7 +1079,11 @@
 #define TR_ONLYPOSITIVE        "Jen kladné"
 #define TR_FILTER              "Filtr"
 #define TR_TELEMETRYFULL       "Všechny sloty jsou plné!"
-#define TR_IGNOREIDS           INDENT "Ignoruj chyby ID"
+#define TR_IGNORE_INSTANCE     INDENT "Ignoruj chyby ID"
+#define TR_DISCOVER_SENSORS    INDENT "Discover new sensors"
+#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery"
+#define TR_DELETE_ALL_SENSORS  INDENT "Delete all sensors"
+#define TR_CONFIRMDELETE       "Really delete all?"
 
 #define TR_MENU_INPUTS         "\314Vstupy"
 #define TR_MENU_LUA            "\322Lua skripty"
diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt
index 053d18159..828cbc488 100644
--- a/radio/src/translations/de.h.txt
+++ b/radio/src/translations/de.h.txt
@@ -1083,7 +1083,11 @@
 #define TR_ONLYPOSITIVE        "Nur Positiv"
 #define TR_FILTER              "Filter aktiv"
 #define TR_TELEMETRYFULL       "Telemetriezeilen voll!"
-#define TR_IGNOREIDS           INDENT "Ignore instance"
+#define TR_IGNORE_INSTANCE     INDENT "Ignore instance"
+#define TR_DISCOVER_SENSORS    INDENT "Discover new sensors"
+#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery"
+#define TR_DELETE_ALL_SENSORS  INDENT "Delete all sensors"
+#define TR_CONFIRMDELETE       "Really delete all?"
 // ----------------------------- Symbole für Auswahlliste----------
 #define TR_MENU_INPUTS         "\314Inputs"
 #define TR_MENU_LUA            "\322Lua Scripte"
diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt
index 09f7128d9..8f60384d4 100644
--- a/radio/src/translations/en.h.txt
+++ b/radio/src/translations/en.h.txt
@@ -1078,7 +1078,11 @@
 #define TR_ONLYPOSITIVE        "Positive"
 #define TR_FILTER              "Filter"
 #define TR_TELEMETRYFULL       "All telemetry slots full!"
-#define TR_IGNOREIDS           TR(INDENT "No inst.","Ignore instance")
+#define TR_IGNORE_INSTANCE     TR(INDENT "No inst.", INDENT "Ignore instances")
+#define TR_DISCOVER_SENSORS    INDENT "Discover new sensors"
+#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery"
+#define TR_DELETE_ALL_SENSORS  INDENT "Delete all sensors"
+#define TR_CONFIRMDELETE       "Really delete all?"
 
 #define TR_MENU_INPUTS         "\314Inputs"
 #define TR_MENU_LUA            "\322Lua scripts"
diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt
index 07db35483..f1014514f 100644
--- a/radio/src/translations/es.h.txt
+++ b/radio/src/translations/es.h.txt
@@ -1033,7 +1033,11 @@
 #define TR_ONLYPOSITIVE        "Positive"
 #define TR_FILTER              "Filter"
 #define TR_TELEMETRYFULL       "All telemetry slots full!"
-#define TR_IGNOREIDS           INDENT "Ignore instance"
+#define TR_IGNORE_INSTANCE     INDENT "Ignore instance"
+#define TR_DISCOVER_SENSORS    INDENT "Discover new sensors"
+#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery"
+#define TR_DELETE_ALL_SENSORS  INDENT "Delete all sensors"
+#define TR_CONFIRMDELETE       "Really delete all?"
 
 #define TR_MENU_INPUTS         "\314Inputs"
 #define TR_MENU_LUA            "\322Lua scripts"
diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt
index 4df6c42ac..8f29c3587 100644
--- a/radio/src/translations/fi.h.txt
+++ b/radio/src/translations/fi.h.txt
@@ -1033,7 +1033,11 @@
 #define TR_ONLYPOSITIVE        "Positive"
 #define TR_FILTER              "Filter"
 #define TR_TELEMETRYFULL       "All telemetry slots full!"
-#define TR_IGNOREIDS           INDENT "Ignore instance"
+#define TR_IGNORE_INSTANCE     INDENT "Ignore instance"
+#define TR_DISCOVER_SENSORS    INDENT "Discover new sensors"
+#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery"
+#define TR_DELETE_ALL_SENSORS  INDENT "Delete all sensors"
+#define TR_CONFIRMDELETE       "Really delete all?"
 
 #define TR_MENU_INPUTS         "\314Inputs"
 #define TR_MENU_LUA            "\322Lua scripts"
diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt
index 52e82ad8b..e02e3f397 100644
--- a/radio/src/translations/fr.h.txt
+++ b/radio/src/translations/fr.h.txt
@@ -1070,7 +1070,11 @@
 #define TR_ONLYPOSITIVE        "Positive"
 #define TR_FILTER              "Filtrage"
 #define TR_TELEMETRYFULL       "Plus de capteurs libres!"
-#define TR_IGNOREIDS           TR(INDENT "Ign. inst.",INDENT "Ignorer instance")
+#define TR_IGNORE_INSTANCE     TR(INDENT "Ign. inst.",INDENT "Ignorer instance")
+#define TR_DISCOVER_SENSORS    INDENT "Découvrir capteurs"
+#define TR_STOP_DISCOVER_SENSORS INDENT "Terminer découverte"
+#define TR_DELETE_ALL_SENSORS  TR(INDENT "Suppr. tous capteurs",INDENT "Supprimer tous capteurs")
+#define TR_CONFIRMDELETE       TR("Tout effacer?","Vraiment tout effacer?")
 
 #define TR_MENU_INPUTS         "\314Entrées"
 #define TR_MENU_LUA            "\322Scripts Lua"
diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt
index dfd92c5be..4fac93abe 100644
--- a/radio/src/translations/it.h.txt
+++ b/radio/src/translations/it.h.txt
@@ -1081,7 +1081,11 @@
 #define TR_ONLYPOSITIVE        "Positivo"
 #define TR_FILTER              "Filtro"
 #define TR_TELEMETRYFULL       "Tutti gli slot sono pieni!"
-#define TR_IGNOREIDS           TR(INDENT "No inst.","Ignora instanza")
+#define TR_IGNORE_INSTANCE     TR(INDENT "No inst.","Ignora instanza")
+#define TR_DISCOVER_SENSORS    INDENT "Discover new sensors"
+#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery"
+#define TR_DELETE_ALL_SENSORS  INDENT "Delete all sensors"
+#define TR_CONFIRMDELETE       "Really delete all?"
 
 #define TR_MENU_INPUTS         "\314Ingressi"
 #define TR_MENU_LUA            "\322Lua scripts"
diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt
index 5580433f6..22c9cceef 100755
--- a/radio/src/translations/nl.h.txt
+++ b/radio/src/translations/nl.h.txt
@@ -1088,7 +1088,11 @@
 #define TR_ONLYPOSITIVE        "Geen Negatief"
 #define TR_FILTER              "Filter aktief"
 #define TR_TELEMETRYFULL       "Telemetrie slots vol!"
-#define TR_IGNOREIDS           TR(INDENT "Neg. ID ","Negeer ID's")
+#define TR_IGNORE_INSTANCE     TR(INDENT "Neg. ID ","Negeer ID's")
+#define TR_DISCOVER_SENSORS    INDENT "Discover new sensors"
+#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery"
+#define TR_DELETE_ALL_SENSORS  INDENT "Delete all sensors"
+#define TR_CONFIRMDELETE       "Really delete all?"
 
 
 #define TR_MENU_INPUTS         "\314Inputs"
diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt
index 715767dc8..7dd395407 100644
--- a/radio/src/translations/pl.h.txt
+++ b/radio/src/translations/pl.h.txt
@@ -1082,7 +1082,11 @@
 #define TR_ONLYPOSITIVE        "Dodatni"
 #define TR_FILTER              "Filtr"
 #define TR_TELEMETRYFULL       "Wszyskie miejsca zajęte!"
-#define TR_IGNOREIDS           INDENT "Ignoruj przypadek"
+#define TR_IGNORE_INSTANCE     INDENT "Ignoruj przypadek"
+#define TR_DISCOVER_SENSORS    INDENT "Discover new sensors"
+#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery"
+#define TR_DELETE_ALL_SENSORS  INDENT "Delete all sensors"
+#define TR_CONFIRMDELETE       "Really delete all?"
 
 #define TR_MENU_INPUTS         "\314Wejści"
 #define TR_MENU_LUA            "\322SkryptyLUA"
diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt
index 9b47dd8fa..e4be20105 100644
--- a/radio/src/translations/pt.h.txt
+++ b/radio/src/translations/pt.h.txt
@@ -1033,7 +1033,11 @@
 #define TR_ONLYPOSITIVE        "Positive"
 #define TR_FILTER              "Filter"
 #define TR_TELEMETRYFULL       "All telemetry slots full!"
-#define TR_IGNOREIDS           INDENT "Ignore instance"
+#define TR_IGNORE_INSTANCE     INDENT "Ignore instance"
+#define TR_DISCOVER_SENSORS    INDENT "Discover new sensors"
+#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery"
+#define TR_DELETE_ALL_SENSORS  INDENT "Delete all sensors"
+#define TR_CONFIRMDELETE       "Really delete all?"
 
 #define TR_MENU_INPUTS         "\314Inputs"
 #define TR_MENU_LUA            "\322Lua scripts"
diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt
index f366ba6d1..7853027f3 100644
--- a/radio/src/translations/se.h.txt
+++ b/radio/src/translations/se.h.txt
@@ -1033,7 +1033,11 @@
 #define TR_ONLYPOSITIVE        "Positive"
 #define TR_FILTER              "Filter"
 #define TR_TELEMETRYFULL       "All telemetry slots full!"
-#define TR_IGNOREIDS           INDENT "Ignore instance"
+#define TR_IGNORE_INSTANCE     INDENT "Ignore instance"
+#define TR_DISCOVER_SENSORS    INDENT "Discover new sensors"
+#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery"
+#define TR_DELETE_ALL_SENSORS  INDENT "Delete all sensors"
+#define TR_CONFIRMDELETE       "Really delete all?"
 
 #define TR_MENU_INPUTS         "\314Inputs"
 #define TR_MENU_LUA            "\322Lua scripts"