diff --git a/before_deploy b/before_deploy
index 358dd1c31..0d8e7eec4 100755
--- a/before_deploy
+++ b/before_deploy
@@ -39,44 +39,45 @@ fi
 mkdir -p ${TMP_DIST}/memstats
 
 for ENV in \
-  custom_ESP8266_4M\
-  dev_ESP8266_4M\
+  custom_ESP8266_4M1M\
+  dev_ESP8266_4M1M\
   esp-wrover-kit_test_1M8_partition\
   esp32test_1M8_partition\
-  hard_SONOFF_POW_4M\
+  hard_SONOFF_POW_4M1M\
   hard_Ventus_W266\
-  hard_core_252_SONOFF_POW_4M\
+  hard_core_252_SONOFF_POW_4M1M\
   hard_core_252_Shelly_1_2M256\
   hard_core_252_other_POW_ESP8285_1M\
   hard_other_POW_ESP8285_1M\
   minimal_IRext_ESP8266_1M\
-  minimal_IRext_ESP8266_4M\
+  minimal_IRext_ESP8266_4M1M\
+  minimal_IRext_ESP8266_4M2M\
   minimal_core_242_ESP8266_1M_OTA\
   minimal_core_242_ESP8285_1M_OTA\
   minimal_core_252_ESP8266_1M_OTA\
   minimal_core_252_ESP8285_1M_OTA\
   normal_ESP8266_1M\
   normal_ESP8266_1M_VCC\
-  normal_ESP8266_4M\
+  normal_ESP8266_4M1M\
   normal_ESP8285_1M\
   normal_WROOM02_2M\
   normal_core_241_ESP8266_1M\
-  normal_core_241_ESP8266_4M\
+  normal_core_241_ESP8266_4M1M\
   normal_core_242_ESP8266_1M\
   normal_core_252_ESP8266_16M\
   normal_core_252_ESP8266_1M\
-  normal_core_252_ESP8266_4M\
+  normal_core_252_ESP8266_4M1M\
   normal_core_252_WROOM02_2M256\
   normal_core_260_sdk222_alpha_ESP8266_16M\
-  normal_core_260_sdk222_alpha_ESP8266_4M\
+  normal_core_260_sdk222_alpha_ESP8266_4M1M\
   test_ESP8266_4M_VCC\
-  test_core_242_ESP8266_4M\
+  test_core_242_ESP8266_4M1M\
   test_core_252_ESP8266_16M\
-  test_core_252_ESP8266_4M\
+  test_core_252_ESP8266_4M1M\
   test_core_260_sdk222_alpha_ESP8266_16M\
-  test_core_260_sdk222_alpha_ESP8266_4M\
+  test_core_260_sdk222_alpha_ESP8266_4M1M\
   test_core_260_sdk3_alpha_ESP8266_16M\
-  test_core_260_sdk3_alpha_ESP8266_4M;\
+  test_core_260_sdk3_alpha_ESP8266_4M1M;\
 do
   MAX_FILESIZE=1044464
   if [[ ${ENV} == *"1M"* ]]; then
diff --git a/platformio.ini b/platformio.ini
index 6a1bf6791..503197187 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -358,7 +358,7 @@ board                     = esp_wroom_02
 build_unflags             = ${common.build_unflags}
 build_flags               = -Wl,-Tesp8266.flash.2m256.ld
 
-[esp8266_4M]
+[ESP8266_4M1M]
 board                     = esp12e
 board_build.flash_mode    = dio
 board_upload.maximum_size = 1044464
@@ -366,6 +366,14 @@ board_build.f_cpu         = ${common.board_build.f_cpu}
 build_unflags             = ${regular_platform.build_unflags}
 build_flags               = -Wl,-Tesp8266.flash.4m1m.ld
 
+[esp8266_4M2M]
+board                     = esp12e
+board_build.flash_mode    = dio
+board_upload.maximum_size = 1044464
+board_build.f_cpu         = ${common.board_build.f_cpu}
+build_unflags             = ${regular_platform.build_unflags}
+build_flags               = -Wl,-Tesp8266.flash.4m2m.ld
+
 
 ; Configuration for the Wemos D1 mini pro (16M)
 ; This configuration can only be used with core versions 2.5.0 or newer.
@@ -380,13 +388,13 @@ build_unflags             = ${regular_platform.build_unflags}
 build_flags               = -Wl,-Tesp8266.flash.16m14m.ld -DSPIFFS_MAX_OPEN_FILES=20
 
 ; NORMAL: 4096k version --------------------------
-[env:custom_ESP8266_4M]
+[env:custom_ESP8266_4M1M]
 platform                  = ${normal_252.platform}
-board                     = ${esp8266_4M.board}
-board_build.f_cpu         = ${esp8266_4M.board_build.f_cpu}
-board_build.flash_mode    = ${esp8266_4M.board_build.flash_mode}
-build_unflags             = ${esp8266_4M.build_unflags}
-build_flags               = ${esp8266_4M.build_flags} ${normal_252.build_flags} -DPLUGIN_BUILD_CUSTOM
+board                     = ${esp8266_4M1M.board}
+board_build.f_cpu         = ${esp8266_4M1M.board_build.f_cpu}
+board_build.flash_mode    = ${esp8266_4M1M.board_build.flash_mode}
+build_unflags             = ${esp8266_4M1M.build_unflags}
+build_flags               = ${esp8266_4M1M.build_flags} ${normal_252.build_flags} -DPLUGIN_BUILD_CUSTOM
 
 extra_scripts             = pre:pre_extra_script.py
 
@@ -589,44 +597,44 @@ build_unflags             = ${espWroom2M256.build_unflags}
 
 
 ; NORMAL: 4096k version --------------------------
-[env:normal_ESP8266_4M]
+[env:normal_ESP8266_4M1M]
 platform                  = ${normal.platform}
-build_flags               = ${esp8266_4M.build_flags} ${normal.build_flags}
-board                     = ${esp8266_4M.board}
-board_build.f_cpu         = ${esp8266_4M.board_build.f_cpu}
-board_build.flash_mode    = ${esp8266_4M.board_build.flash_mode}
-build_unflags             = ${esp8266_4M.build_unflags}
+build_flags               = ${esp8266_4M1M.build_flags} ${normal.build_flags}
+board                     = ${esp8266_4M1M.board}
+board_build.f_cpu         = ${esp8266_4M1M.board_build.f_cpu}
+board_build.flash_mode    = ${esp8266_4M1M.board_build.flash_mode}
+build_unflags             = ${esp8266_4M1M.build_unflags}
 
 
 
-;[env:normal_core_240_ESP8266_4M]
+;[env:normal_core_240_ESP8266_4M1M]
 ;platform                  = ${normal_240.platform}
-;build_flags               = ${normal_240.build_flags} ${esp8266_4M.build_flags}
-;board                     = ${esp8266_4M.board}
-;board_build.f_cpu         = ${esp8266_4M.board_build.f_cpu}
-;board_build.flash_mode    = ${esp8266_4M.board_build.flash_mode}
-;build_unflags             = ${esp8266_4M.build_unflags}
+;build_flags               = ${normal_240.build_flags} ${esp8266_4M1M.build_flags}
+;board                     = ${esp8266_4M1M.board}
+;board_build.f_cpu         = ${esp8266_4M1M.board_build.f_cpu}
+;board_build.flash_mode    = ${esp8266_4M1M.board_build.flash_mode}
+;build_unflags             = ${esp8266_4M1M.build_unflags}
 
 ;
 
-[env:normal_core_241_ESP8266_4M]
+[env:normal_core_241_ESP8266_4M1M]
 platform                  = ${normal_241.platform}
-build_flags               = ${normal_241.build_flags} ${esp8266_4M.build_flags}
-board                     = ${esp8266_4M.board}
-board_build.f_cpu         = ${esp8266_4M.board_build.f_cpu}
-board_build.flash_mode    = ${esp8266_4M.board_build.flash_mode}
-build_unflags             = ${esp8266_4M.build_unflags}
+build_flags               = ${normal_241.build_flags} ${esp8266_4M1M.build_flags}
+board                     = ${esp8266_4M1M.board}
+board_build.f_cpu         = ${esp8266_4M1M.board_build.f_cpu}
+board_build.flash_mode    = ${esp8266_4M1M.board_build.flash_mode}
+build_unflags             = ${esp8266_4M1M.build_unflags}
 
 
 
 
-[env:normal_core_252_ESP8266_4M]
+[env:normal_core_252_ESP8266_4M1M]
 platform                  = ${normal_252.platform}
-build_flags               = ${normal_252.build_flags} ${esp8266_4M.build_flags}
-board                     = ${esp8266_4M.board}
-board_build.f_cpu         = ${esp8266_4M.board_build.f_cpu}
-board_build.flash_mode    = ${esp8266_4M.board_build.flash_mode}
-build_unflags             = ${esp8266_4M.build_unflags}
+build_flags               = ${normal_252.build_flags} ${esp8266_4M1M.build_flags}
+board                     = ${esp8266_4M1M.board}
+board_build.f_cpu         = ${esp8266_4M1M.board_build.f_cpu}
+board_build.flash_mode    = ${esp8266_4M1M.board_build.flash_mode}
+build_unflags             = ${esp8266_4M1M.build_unflags}
 
 
 
@@ -660,27 +668,36 @@ board_build.flash_mode    = ${esp8266_1M.board_build.flash_mode}
 ; Minimal IR: 4096k version --------------------------
 ; Build including IR libraries, INCLUDING extended AC commands
 ; Includes Extended IR AC commands (takes a lot more program space)
-[env:minimal_IRext_ESP8266_4M]
+[env:minimal_IRext_ESP8266_4M1M]
 platform                  = ${minimal_ir_extended.platform} 
 lib_ignore                = ${minimal_ir_extended.lib_ignore}
-build_flags               = ${minimal_ir_extended.build_flags} ${esp8266_4M.build_flags}
-build_unflags             = ${esp8266_4M.build_unflags}
-board                     = ${esp8266_4M.board}
-board_build.f_cpu         = ${esp8266_4M.board_build.f_cpu}
-board_build.flash_mode    = ${esp8266_4M.board_build.flash_mode}
+build_flags               = ${minimal_ir_extended.build_flags} ${esp8266_4M1M.build_flags}
+build_unflags             = ${esp8266_4M1M.build_unflags}
+board                     = ${esp8266_4M1M.board}
+board_build.f_cpu         = ${esp8266_4M1M.board_build.f_cpu}
+board_build.flash_mode    = ${esp8266_4M1M.board_build.flash_mode}
+
+[env:minimal_IRext_ESP8266_4M2M]
+platform                  = ${minimal_ir_extended.platform} 
+lib_ignore                = ${minimal_ir_extended.lib_ignore}
+build_flags               = ${minimal_ir_extended.build_flags} ${esp8266_4M2M.build_flags}
+build_unflags             = ${esp8266_4M2M.build_unflags}
+board                     = ${esp8266_4M2M.board}
+board_build.f_cpu         = ${esp8266_4M2M.board_build.f_cpu}
+board_build.flash_mode    = ${esp8266_4M2M.board_build.flash_mode}
 
 
 ; NORMAL IR: 4096k version --------------------------
 ; Build including IR libraries, INCLUDING extended AC commands
 ; Includes Extended IR AC commands (takes a lot more program space)
-; [env:normal_IRext_ESP8266_4M]
+; [env:normal_IRext_ESP8266_4M1M]
 ; platform                  = ${normal_ir_extended.platform} 
 ; lib_ignore                = ${normal_ir_extended.lib_ignore}
-; build_flags               = ${normal_ir_extended.build_flags} ${esp8266_4M.build_flags}
-; build_unflags             = ${esp8266_4M.build_unflags}
-; board                     = ${esp8266_4M.board}
-; board_build.f_cpu         = ${esp8266_4M.board_build.f_cpu}
-; board_build.flash_mode    = ${esp8266_4M.board_build.flash_mode}
+; build_flags               = ${normal_ir_extended.build_flags} ${esp8266_4M1M.build_flags}
+; build_unflags             = ${esp8266_4M1M.build_unflags}
+; board                     = ${esp8266_4M1M.board}
+; board_build.f_cpu         = ${esp8266_4M1M.board_build.f_cpu}
+; board_build.flash_mode    = ${esp8266_4M1M.board_build.flash_mode}
 
 
 ; 
@@ -721,54 +738,54 @@ board_build.flash_mode    = ${esp8266_4M.board_build.flash_mode}
 
 
 ; TEST: 4096k version ----------------------------
-[env:test_core_242_ESP8266_4M]
+[env:test_core_242_ESP8266_4M1M]
 platform                  = ${testing_242.platform}
-build_flags               = ${esp8266_4M.build_flags} ${testing_242.build_flags}
-board                     = ${esp8266_4M.board}
-board_build.f_cpu         = ${esp8266_4M.board_build.f_cpu}
-board_build.flash_mode    = ${esp8266_4M.board_build.flash_mode}
-build_unflags             = ${esp8266_4M.build_unflags}
+build_flags               = ${esp8266_4M1M.build_flags} ${testing_242.build_flags}
+board                     = ${esp8266_4M1M.board}
+board_build.f_cpu         = ${esp8266_4M1M.board_build.f_cpu}
+board_build.flash_mode    = ${esp8266_4M1M.board_build.flash_mode}
+build_unflags             = ${esp8266_4M1M.build_unflags}
 
 
 
 
 
-[env:test_core_252_ESP8266_4M]
+[env:test_core_252_ESP8266_4M1M]
 platform                  = ${testing_252.platform}
-build_flags               = ${esp8266_4M.build_flags} ${testing_252.build_flags}
-board                     = ${esp8266_4M.board}
-board_build.f_cpu         = ${esp8266_4M.board_build.f_cpu}
-board_build.flash_mode    = ${esp8266_4M.board_build.flash_mode}
-build_unflags             = ${esp8266_4M.build_unflags}
+build_flags               = ${esp8266_4M1M.build_flags} ${testing_252.build_flags}
+board                     = ${esp8266_4M1M.board}
+board_build.f_cpu         = ${esp8266_4M1M.board_build.f_cpu}
+board_build.flash_mode    = ${esp8266_4M1M.board_build.flash_mode}
+build_unflags             = ${esp8266_4M1M.build_unflags}
 
 
-[env:normal_core_260_sdk222_alpha_ESP8266_4M]
+[env:normal_core_260_sdk222_alpha_ESP8266_4M1M]
 platform                  = ${testing_beta.platform}
-build_flags               = ${esp8266_4M.build_flags} ${normal_beta.build_flags} -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22y
-board                     = ${esp8266_4M.board}
-board_build.f_cpu         = ${esp8266_4M.board_build.f_cpu}
-board_build.flash_mode    = ${esp8266_4M.board_build.flash_mode}
-build_unflags             = ${esp8266_4M.build_unflags}
+build_flags               = ${esp8266_4M1M.build_flags} ${normal_beta.build_flags} -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22y
+board                     = ${esp8266_4M1M.board}
+board_build.f_cpu         = ${esp8266_4M1M.board_build.f_cpu}
+board_build.flash_mode    = ${esp8266_4M1M.board_build.flash_mode}
+build_unflags             = ${esp8266_4M1M.build_unflags}
 
 
 
-[env:test_core_260_sdk222_alpha_ESP8266_4M]
+[env:test_core_260_sdk222_alpha_ESP8266_4M1M]
 platform                  = ${testing_beta.platform}
-build_flags               = ${esp8266_4M.build_flags} ${testing_beta.build_flags} -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x
-board                     = ${esp8266_4M.board}
-board_build.f_cpu         = ${esp8266_4M.board_build.f_cpu}
-board_build.flash_mode    = ${esp8266_4M.board_build.flash_mode}
-build_unflags             = ${esp8266_4M.build_unflags}
+build_flags               = ${esp8266_4M1M.build_flags} ${testing_beta.build_flags} -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x
+board                     = ${esp8266_4M1M.board}
+board_build.f_cpu         = ${esp8266_4M1M.board_build.f_cpu}
+board_build.flash_mode    = ${esp8266_4M1M.board_build.flash_mode}
+build_unflags             = ${esp8266_4M1M.build_unflags}
 
 
 
-[env:test_core_260_sdk3_alpha_ESP8266_4M]
+[env:test_core_260_sdk3_alpha_ESP8266_4M1M]
 platform                  = ${testing_beta.platform}
-build_flags               = ${esp8266_4M.build_flags} ${testing_beta.build_flags} -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3
-board                     = ${esp8266_4M.board}
-board_build.f_cpu         = ${esp8266_4M.board_build.f_cpu}
-board_build.flash_mode    = ${esp8266_4M.board_build.flash_mode}
-build_unflags             = ${esp8266_4M.build_unflags}
+build_flags               = ${esp8266_4M1M.build_flags} ${testing_beta.build_flags} -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3
+board                     = ${esp8266_4M1M.board}
+board_build.f_cpu         = ${esp8266_4M1M.board_build.f_cpu}
+board_build.flash_mode    = ${esp8266_4M1M.board_build.flash_mode}
+build_unflags             = ${esp8266_4M1M.build_unflags}
 
 
 [env:test_core_252_ESP8266_16M]
@@ -828,11 +845,11 @@ build_unflags             = ${esp8266_16M.build_unflags}
 ; TEST: 4096k version + FEATURE_ADC_VCC ----------
 [env:test_ESP8266_4M_VCC]
 platform                  = ${testing.platform}
-build_flags               = ${esp8266_4M.build_flags} ${testing.build_flags} -D FEATURE_ADC_VCC=true
-board                     = ${esp8266_4M.board}
-board_build.f_cpu         = ${esp8266_4M.board_build.f_cpu}
-board_build.flash_mode    = ${esp8266_4M.board_build.flash_mode}
-build_unflags             = ${esp8266_4M.build_unflags}
+build_flags               = ${esp8266_4M1M.build_flags} ${testing.build_flags} -D FEATURE_ADC_VCC=true
+board                     = ${esp8266_4M1M.board}
+board_build.f_cpu         = ${esp8266_4M1M.board_build.f_cpu}
+board_build.flash_mode    = ${esp8266_4M1M.board_build.flash_mode}
+build_unflags             = ${esp8266_4M1M.build_unflags}
 
 
 
@@ -865,13 +882,13 @@ build_unflags             = ${esp8266_4M.build_unflags}
 
 
 ; DEV : 4096k version ----------------------------
-[env:dev_ESP8266_4M]
+[env:dev_ESP8266_4M1M]
 platform                  = ${dev.platform}
-build_flags               = ${esp8266_4M.build_flags} ${dev.build_flags}
-board                     = ${esp8266_4M.board}
-board_build.f_cpu         = ${esp8266_4M.board_build.f_cpu}
-board_build.flash_mode    = ${esp8266_4M.board_build.flash_mode}
-build_unflags             = ${esp8266_4M.build_unflags}
+build_flags               = ${esp8266_4M1M.build_flags} ${dev.build_flags}
+board                     = ${esp8266_4M1M.board}
+board_build.f_cpu         = ${esp8266_4M1M.board_build.f_cpu}
+board_build.flash_mode    = ${esp8266_4M1M.board_build.flash_mode}
+build_unflags             = ${esp8266_4M1M.build_unflags}
 
 
 
@@ -917,24 +934,24 @@ build_unflags             = ${esp8266_4M.build_unflags}
 ; GPIO03 Serial TXD
 ; GPIO12 Red Led and Relay (0 = Off, 1 = On)
 ; GPIO13 Blue Led (0 = On, 1 = Off)
-[env:hard_SONOFF_POW_4M]
+[env:hard_SONOFF_POW_4M1M]
 platform                  = ${normal.platform}
-build_flags               = ${normal.build_flags} ${esp8266_4M.build_flags} -D PLUGIN_SET_SONOFF_POW
-board_build.f_cpu         = ${esp8266_4M.board_build.f_cpu}
-board_build.flash_mode    = ${esp8266_4M.board_build.flash_mode}
-board                     = ${esp8266_4M.board}
-build_unflags             = ${esp8266_4M.build_unflags}
+build_flags               = ${normal.build_flags} ${esp8266_4M1M.build_flags} -D PLUGIN_SET_SONOFF_POW
+board_build.f_cpu         = ${esp8266_4M1M.board_build.f_cpu}
+board_build.flash_mode    = ${esp8266_4M1M.board_build.flash_mode}
+board                     = ${esp8266_4M1M.board}
+build_unflags             = ${esp8266_4M1M.build_unflags}
 
 
 
 
-[env:hard_core_252_SONOFF_POW_4M]
+[env:hard_core_252_SONOFF_POW_4M1M]
 platform                  = ${normal_252.platform}
-build_flags               = ${normal_252.build_flags} ${esp8266_4M.build_flags} -D PLUGIN_SET_SONOFF_POW
-board_build.f_cpu         = ${esp8266_4M.board_build.f_cpu}
-board_build.flash_mode    = ${esp8266_4M.board_build.flash_mode}
-board                     = ${esp8266_4M.board}
-build_unflags             = ${esp8266_4M.build_unflags}
+build_flags               = ${normal_252.build_flags} ${esp8266_4M1M.build_flags} -D PLUGIN_SET_SONOFF_POW
+board_build.f_cpu         = ${esp8266_4M1M.board_build.f_cpu}
+board_build.flash_mode    = ${esp8266_4M1M.board_build.flash_mode}
+board                     = ${esp8266_4M1M.board}
+build_unflags             = ${esp8266_4M1M.build_unflags}