diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 689b71748..c621487b8 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## Unreleased (development)
 
+### 9.0.0.1 20200930
+
+- Change redesigning ESP8266 GPIO internal numbering in line with ESP32
+- Remove auto config update for all Friendlynames and Switchtopic from versions before 8.x
+  Valid migration path is from 7.x to 8.x to 9.x
+
 ### 8.5.0.1 20200907
 
 - Fix energy total counters (#9263, #9266)
diff --git a/tasmota/support.ino b/tasmota/support.ino
index 413747f7f..ca42dda28 100644
--- a/tasmota/support.ino
+++ b/tasmota/support.ino
@@ -1164,6 +1164,44 @@ void ConvertGpios(void) {
 //    AddLogBufferSize(LOG_LEVEL_DEBUG, (uint8_t *)&Settings.my_gp.io, sizeof(myio) / 2, 2);
   }
 }
+
+/*
+void DumpConvertTable(void) {
+  bool jsflg = false;
+  uint32_t lines = 1;
+  for (uint32_t i = 0; i < ARRAY_SIZE(kGpioConvert); i++) {
+    uint32_t data = pgm_read_word(kGpioConvert + i);
+    if (!jsflg) {
+      Response_P(PSTR("{\"GPIOConversion%d\":{"), lines);
+    } else {
+      ResponseAppend_P(PSTR(","));
+    }
+    jsflg = true;
+    if ((ResponseAppend_P(PSTR("\"%d\":\"%d\""), i, data) > (LOGSZ - TOPSZ)) || (i == ARRAY_SIZE(kGpioConvert) -1)) {
+      ResponseJsonEndEnd();
+      MqttPublishPrefixTopic_P(RESULT_OR_STAT, XdrvMailbox.command);
+      jsflg = false;
+      lines++;
+    }
+  }
+  for (uint32_t i = 0; i < ARRAY_SIZE(kAdcNiceList); i++) {
+    uint32_t data = pgm_read_word(kAdcNiceList + i);
+    if (!jsflg) {
+      Response_P(PSTR("{\"ADC0Conversion%d\":{"), lines);
+    } else {
+      ResponseAppend_P(PSTR(","));
+    }
+    jsflg = true;
+    if ((ResponseAppend_P(PSTR("\"%d\":\"%d\""), i, data) > (LOGSZ - TOPSZ)) || (i == ARRAY_SIZE(kAdcNiceList) -1)) {
+      ResponseJsonEndEnd();
+      MqttPublishPrefixTopic_P(RESULT_OR_STAT, XdrvMailbox.command);
+      jsflg = false;
+      lines++;
+    }
+  }
+  mqtt_data[0] = '\0';
+}
+*/
 #endif  // ESP8266
 
 uint32_t ICACHE_RAM_ATTR Pin(uint32_t gpio, uint32_t index = 0);
diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index 4272d3a0c..b98287940 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -1202,6 +1202,12 @@ void ShowGpios(const uint16_t *NiceList, uint32_t size, uint32_t offset, uint32_
 
 void CmndGpios(void)
 {
+/*
+  if (XdrvMailbox.payload == 17) {
+    DumpConvertTable();
+    return;
+  }
+*/
   uint32_t lines = 1;
   ShowGpios(kGpioNiceList, ARRAY_SIZE(kGpioNiceList), 0, lines);
 #ifdef ESP8266
diff --git a/tasmota/tasmota_globals.h b/tasmota/tasmota_globals.h
index a711e35a1..5d6d9570f 100644
--- a/tasmota/tasmota_globals.h
+++ b/tasmota/tasmota_globals.h
@@ -378,13 +378,8 @@ const char kWebColors[] PROGMEM =
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 #endif
 
-//#ifdef ESP8266
-//#define AGPIO(x) (x)
-//#define BGPIO(x) (x)
-//#else  // ESP32
 #define AGPIO(x) (x<<5)
 #define BGPIO(x) (x>>5)
-//#endif  // ESP8266 - ESP32
 
 #ifdef USE_DEVICE_GROUPS
 #define SendDeviceGroupMessage(DEVICE_INDEX, REQUEST_TYPE, ...) _SendDeviceGroupMessage(DEVICE_INDEX, REQUEST_TYPE, __VA_ARGS__, 0)
diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h
index 3103534c2..7d8239be6 100644
--- a/tasmota/tasmota_version.h
+++ b/tasmota/tasmota_version.h
@@ -20,7 +20,7 @@
 #ifndef _TASMOTA_VERSION_H_
 #define _TASMOTA_VERSION_H_
 
-const uint32_t VERSION = 0x08050001;
+const uint32_t VERSION = 0x09000001;
 
 // Lowest compatible version
 const uint32_t VERSION_COMPATIBLE = 0x07010006;