diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 9809eb09c..2cda4d73b 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -21,7 +21,7 @@ While fallback or downgrading is common practice it was never supported due to S
 
 ## Supported Core versions
 
-This release will be supported from ESP8266/Arduino library Core version **2.7.0** due to reported security and stability issues on previous Core version. This will also support gzipped binaries.
+This release will be supported from ESP8266/Arduino library Core version **2.7.1** due to reported security and stability issues on previous Core version. This will also support gzipped binaries.
 
 Although it might still compile on previous Core versions all support will be removed in the near future.
 
@@ -35,7 +35,7 @@ For initial configuration this release supports Webserver based **WifiManager**
 
 ## Provided Binary Downloads
 
-The following binary downloads have been compiled with ESP8266/Arduino library core version **2.7.0**.
+The following binary downloads have been compiled with ESP8266/Arduino library core version **2.7.1**.
 
 - **tasmota.bin** = The Tasmota version with most drivers. **RECOMMENDED RELEASE BINARY**
 - **tasmota-BG.bin** to **tasmota-TW.bin** = The Tasmota version in different languages.
diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index de890ee41..2e7c04b7a 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -1391,6 +1391,7 @@ void SettingsDelta(void)
 #endif  // ESP8266
 
     if (Settings.version < 0x08020004) {
+      Settings.flag3.mqtt_buttons = 0;  // SetOption73 (0) - Decouple button from relay and send just mqtt topic
 #ifdef ESP8266
       Settings.config_version = 0;  // ESP8266 (Has been 0 for long time)
 #endif  // ESP8266
diff --git a/tasmota/support_button_v2.ino b/tasmota/support_button_v2.ino
index 4dc94cf13..688c2e4eb 100644
--- a/tasmota/support_button_v2.ino
+++ b/tasmota/support_button_v2.ino
@@ -182,14 +182,14 @@ void ButtonHandler(void)
       else {
         if ((PRESSED == button) && (NOT_PRESSED == Button.last_state[button_index])) {
 
-          if (Settings.flag.button_single) {                   // SetOption13 (0) - Allow only single button press for immediate action, SetOption73 (0) - Decouple button from relay and send just mqtt topic
-            if (!Settings.flag3.mqtt_buttons) {
+          if (Settings.flag.button_single) {           // SetOption13 (0) - Allow only single button press for immediate action,
+            if (!Settings.flag3.mqtt_buttons) {        // SetOption73 (0) - Decouple button from relay and send just mqtt topic
               AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_APPLICATION D_BUTTON "%d " D_IMMEDIATE), button_index +1);
               if (!SendKey(KEY_BUTTON, button_index +1, POWER_TOGGLE)) {  // Execute Toggle command via MQTT if ButtonTopic is set
                 ExecuteCommandPower(button_index +1, POWER_TOGGLE, SRC_BUTTON);  // Execute Toggle command internally
               }
             } else {
-              MqttButtonTopic(button_index +1, 1, 0); // SetOption73 (0) - Decouple button from relay and send just mqtt topic
+              MqttButtonTopic(button_index +1, 1, 0);  // SetOption73 1 - Decouple button from relay and send just mqtt topic
             }
           } else {
             Button.press_counter[button_index] = (Button.window_timer[button_index]) ? Button.press_counter[button_index] +1 : 1;