diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index d8bb487bd..8599df428 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -6,7 +6,7 @@
   - [ ] The pull request is done against the latest dev branch
   - [ ] Only relevant files were touched
   - [ ] Only one feature/fix was added per PR.
-  - [ ] The code change is tested and works on core ESP8266 V.2.7.0
+  - [ ] The code change is tested and works on core ESP8266 V.2.7.1
   - [ ] The code change is tested and works on core ESP32 V.1.12.0
   - [ ] I accept the [CLA](https://github.com/arendst/Tasmota/blob/development/CONTRIBUTING.md#contributor-license-agreement-cla).
 
diff --git a/platformio.ini b/platformio.ini
index 618e7e572..a6f4c8863 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -113,9 +113,9 @@ platform_packages         = ${tasmota_core.platform_packages}
 build_flags               = ${tasmota_core.build_flags}
 
 [tasmota_core]
-; *** Esp8266 Arduino core 2.7.0
-platform                  = espressif8266@2.5.0
-platform_packages         = framework-arduinoespressif8266 @ https://github.com/tasmota/Arduino/releases/download/2.7.0/esp8266-2.7.0.zip
+; *** Esp8266 Arduino core 2.7.1
+platform                  = espressif8266@2.5.1
+platform_packages         = 
 build_flags               = ${esp82xx_defaults.build_flags}
                             -DBEARSSL_SSL_BASIC
 ; NONOSDK22x_190703 = 2.2.2-dev(38a443e)
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 22bd8cf70..f4c1d9ccd 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -83,16 +83,14 @@ extra_scripts             = ${scripts_defaults.extra_scripts}
 
 [tasmota_stage]
 ; *** Esp8266 core for Arduino version Tasmota stage
-platform                  = espressif8266@2.5.0
+extends                   = tasmota_core
 platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#36e047e908cfa6eafaaf824988070b49f2c2ff2a
-build_flags               = ${esp82xx_defaults.build_flags}
-                            -DBEARSSL_SSL_BASIC
+;
+; *********** Alternative Options, enable only if you know exactly what you do ********
 ; NONOSDK221
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221
 ; NONOSDK22x_190313
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313
-; NONOSDK22x_190703 = 2.2.1+100-dev(38a443e) (Tasmota default) (Firmware 2K smaller than NONOSDK22x_191105)
-                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703
 ; NONOSDK22x_191024 = 2.2.1+111-dev(5ab15d1)
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024
 ; NONOSDK22x_191105 = 2.2.1+113-dev(bb83b9b)
@@ -109,34 +107,24 @@ build_flags               = ${esp82xx_defaults.build_flags}
 ;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
 ; lwIP 2 - Higher Bandwidth Low Memory no Features
 ;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH
-; lwIP 2 - Higher Bandwidth no Features (Tasmota default)
-                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
-; VTABLES in Flash (Tasmota default)
-                            -DVTABLES_IN_FLASH
 ; VTABLES in Heap
 ;                            -DVTABLES_IN_DRAM
 ; VTABLES in IRAM
 ;                            -DVTABLES_IN_IRAM
-; enable one option set -> No exception recommended
-; No exception code in firmware
-                            -fno-exceptions
-                            -lstdc++
-; Exception code in firmware /needs much space! 90k
+; Exception code in firmware /needs much space!
 ;                           -fexceptions
 ;                           -lstdc++-exc
 
 [core_stage]
 ; *** Esp8266 core for Arduino version latest development version
-platform                  = espressif8266@2.5.0
+extends                   = tasmota_core
 platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git
-build_flags               = ${esp82xx_defaults.build_flags}
-                            -DBEARSSL_SSL_BASIC
+;
+; *********** Alternative Options, enable only if you know exactly what you do ********
 ; NONOSDK221
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221
 ; NONOSDK22x_190313
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313
-; NONOSDK22x_190703 = 2.2.1+100-dev(38a443e) (Tasmota default) (Firmware 2K smaller than NONOSDK22x_191105)
-                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703
 ; NONOSDK22x_191024 = 2.2.1+111-dev(5ab15d1)
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024
 ; NONOSDK22x_191105 = 2.2.1+113-dev(bb83b9b)
@@ -153,19 +141,11 @@ build_flags               = ${esp82xx_defaults.build_flags}
 ;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
 ; lwIP 2 - Higher Bandwidth Low Memory no Features
 ;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH
-; lwIP 2 - Higher Bandwidth no Features (Tasmota default)
-                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
-; VTABLES in Flash (Tasmota default)
-                            -DVTABLES_IN_FLASH
 ; VTABLES in Heap
 ;                            -DVTABLES_IN_DRAM
 ; VTABLES in IRAM
 ;                            -DVTABLES_IN_IRAM
-; enable one option set -> No exception recommended
-; No exception code in firmware
-                            -fno-exceptions
-                            -lstdc++
-; Exception code in firmware /needs much space! 90k
+; Exception code in firmware /needs much space!
 ;                           -fexceptions
 ;                           -lstdc++-exc