diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcef330d4..01c64b5b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,13 +8,14 @@ All notable changes to this project will be documented in this file.
 
 ### Breaking Changed
 
-### Fixed
-
-### Removed
-
 ### Changed
 - ESP32 max number of supported switches/buttons/relays from 28 to 32
 - ESP32 max number of interlocks from 14 to 16
+- ESP32 Platform from 2024.11.30 to 2024.11.31, Framework (Arduino Core) from v3.1.0.241030 to v3.1.0.241117 and IDF to 5.3.1.241024 (#22504)
+
+### Fixed
+
+### Removed
 
 ## [14.3.0.6] 20241116
 ### Added
@@ -30,6 +31,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 - Redesign GUI adding feedback to buttons, shutters and lights
+- Use command `WebButton1` to change GUI shutter 1 name
 
 ### Removed
 - Command ``SetOption161 1`` to disable web page slider updates by commands
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ed100cf8d..297e99b85 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -145,9 +145,10 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 ### Breaking Changed
 
 ### Changed
-- ESP32 Platform from 2024.09.30 to 2024.11.30, Framework (Arduino Core) from v3.1.0.240926 to v3.1.0.241030 and IDF to 5.3.1.241024 [#22384](https://github.com/arendst/Tasmota/issues/22384)
+- ESP32 Platform from 2024.09.30 to 2024.11.31, Framework (Arduino Core) from v3.1.0.240926 to v3.1.0.241117 and IDF to 5.3.1.241024 [#22504](https://github.com/arendst/Tasmota/issues/22504)
 - ESP32 LVGL library from v9.2.0 to v9.2.2 [#22385](https://github.com/arendst/Tasmota/issues/22385)
 - Redesign GUI adding feedback to buttons, shutters and lights
+- Use command `WebButton1` to change GUI shutter 1 name
 - Unit (k)VAr(h) to (k)var(h) [#22435](https://github.com/arendst/Tasmota/issues/22435)
 - AHT1X/AHT2X/AHT3X ready for virtual I2C [#22427](https://github.com/arendst/Tasmota/issues/22427)
 - SGP4X ready for virtual I2C [#22427](https://github.com/arendst/Tasmota/issues/22427)
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_28_pcf8574_v2.ino b/tasmota/tasmota_xdrv_driver/xdrv_28_pcf8574_v2.ino
index 53e01ddb4..874cbd772 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_28_pcf8574_v2.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_28_pcf8574_v2.ino
@@ -190,10 +190,10 @@ int Pcf8574Pin(uint32_t gpio, uint32_t index = 0);
 int Pcf8574Pin(uint32_t gpio, uint32_t index) {
   uint16_t real_gpio = gpio << 5;
   uint16_t mask = 0xFFE0;
-//  if (index < GPIO_ANY) {
+  if (index < GPIO_ANY) {
     real_gpio += index;
     mask = 0xFFFF;
-//  }
+  }
   for (uint32_t i = 0; i <= Pcf8574.max_connected_ports; i++) {
     if ((Pcf8574_pin[i] & mask) == real_gpio) {
       return i;                                        // Pin number configured for gpio
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_67_mcp23xxx.ino b/tasmota/tasmota_xdrv_driver/xdrv_67_mcp23xxx.ino
index c867692fd..8cb1196ac 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_67_mcp23xxx.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_67_mcp23xxx.ino
@@ -430,10 +430,10 @@ int MCP23xPin(uint32_t gpio, uint32_t index = 0);
 int MCP23xPin(uint32_t gpio, uint32_t index) {
   uint16_t real_gpio = gpio << 5;
   uint16_t mask = 0xFFE0;
-//  if (index < GPIO_ANY) {
+  if (index < GPIO_ANY) {
     real_gpio += index;
     mask = 0xFFFF;
-//  }
+  }
   for (uint32_t i = 0; i <= Mcp23x.max_pins; i++) {
     if ((Mcp23x_gpio_pin[i] & mask) == real_gpio) {
       return i;                                        // Pin number configured for gpio