From 62f4419a595353fcf92643226d536751cbdc26f2 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 18 Dec 2019 14:48:32 +0100
Subject: [PATCH 1/2] Update settings.ino

---
 tasmota/settings.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index afb327725..139fd3845 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -1386,7 +1386,7 @@ void SettingsDelta(void)
       memcpy((char*)&Settings.serial_config, (char*)&Settings.ex_serial_config, 5);  // 1E4 -> EFE
     }
 
-    if ((VERSION < 0x08000000) && (Settings.version > VERSION)) {
+    if ((VERSION < 0x08000000) && (Settings.version >= 0x08000000)) {
       char temp[strlen(SettingsText(SET_OTAURL)) +1];              strncpy(temp, SettingsText(SET_OTAURL), sizeof(temp));
       char temp21[strlen(SettingsText(SET_MQTTPREFIX1)) +1];       strncpy(temp21, SettingsText(SET_MQTTPREFIX1), sizeof(temp21));
       char temp22[strlen(SettingsText(SET_MQTTPREFIX2)) +1];       strncpy(temp22, SettingsText(SET_MQTTPREFIX2), sizeof(temp22));

From e574f7dd841a501406a2cd2632f2a07a17ac7b53 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 18 Dec 2019 14:54:14 +0100
Subject: [PATCH 2/2] Add fallback support from version 8.x

---
 RELEASENOTES.md      | 2 ++
 tasmota/CHANGELOG.md | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index b8220e8d3..4360e8ee3 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -54,6 +54,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Change GUI Shutter button text to Up and Down Arrows based on PR by Xavier Muller (#7166)
 - Change amount of supported DHT sensors from 3 to 4 by Xavier Muller (#7167)
 - Change some Settings locations freeing up space for future single char allowing variable length text
+- Change tasmota-basic.bin and FIRMWARE_BASIC to tasmota-lite.bin and FIRMWARE_LITE
 - Fix flashing H801 led at boot by Stefan Hadinger (#7165, #649)
 - Fix duplicated ``Backlog`` when using Event inside a Backlog by Adrian Scillato (#7178, #7147)
 - Fix Gui Timer when using a negative zero offset of -00:00 by Peter Ooms (#7174)
@@ -71,3 +72,4 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Add reporting of raw weight to JSON from HX711 to overcome auto-tare functionality by @tobox (#7171)
 - Add Zigbee support for Xiaomi Aqara Vibration Sensor and Presence Sensor by Stefan Hadinger
 - Add Shutter functions ramp up/down and MQTT reporting by Stefan Bode
+- Add fallback support from version 8.x
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 90f29af2a..1bf38a0ec 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -6,7 +6,7 @@
 - Change tasmota-basic.bin and FIRMWARE_BASIC to tasmota-lite.bin and FIRMWARE_LITE
 - Add Zigbee send automatic ZigbeeRead after sending a command
 - Add Zigbee improving Occupancy:false detection for Aqara sensor
-- Add fallback functionality from next version 8.x
+- Add fallback support from version 8.x
 
 ### 7.1.2.5 20191213