diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f884330ee..ede03ce8f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,9 @@ variables:
   # Versioned esp-idf-doc env image to use for all document building jobs
   ESP_IDF_DOC_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-idf-doc-env:v8"
 
+  GIT_SUBMODULE_STRATEGY: recursive
+  ESPCI_TOKEN: $GITLAB_KEY
+
 # before each job, we need to check if this job is filtered by bot stage/job filter
 .apply_bot_filter: &apply_bot_filter
   python $APPLY_BOT_FILTER_SCRIPT || exit 0
@@ -102,13 +105,14 @@ build_docs:
       - $BOT_LABEL_BUILD_DOCS
       - $BOT_LABEL_REGULAR_TEST
   script:
+    - source /opt/pyenv/activate && pyenv global 3.6.10
+    - /opt/pyenv/pyenv-1.2.16/versions/3.6.10/bin/python -m pip install --user -r $CI_PROJECT_DIR/docs/requirements.txt
     - cd docs
     - cd en
     - make gh-linkcheck
     - make html
     - ../check_doc_warnings.sh
 
-    
 .build_examples_make_template: &build_examples_make_template
   <<: *build_template
   # This is a workaround for a rarely encountered issue with building examples in CI.
diff --git a/.gitmodules b/.gitmodules
index d36acbfe5..5051ce92e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,4 +16,4 @@
 
 [submodule "components/coap/libcoap"]
 	path = components/coap/libcoap
-	url = ../../obgm/libcoap.git
+	url = https://jihulab.com/esp-mirror/obgm/libcoap.git
diff --git a/.readthedocs.yml b/.readthedocs.yaml
similarity index 55%
rename from .readthedocs.yml
rename to .readthedocs.yaml
index 569fae4c4..3704e9469 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yaml
@@ -5,6 +5,12 @@
 # Required
 version: 2
 
+# Set the version of Python and other tools you might need
+build:
+  os: "ubuntu-20.04"
+  tools:
+    python: "3.6"
+
 # Optionally build your docs in additional formats such as PDF and ePub
 formats:
   - htmlzip
@@ -12,6 +18,10 @@ formats:
 
 # Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 2.7
   install:
-    - requirements: docs/requirements.txt
\ No newline at end of file
+    - requirements: docs/setuptools.requirements.txt
+    - requirements: docs/requirements.txt
+
+# Specify the path for conf.py
+sphinx:
+  configuration: docs/en/conf.py
diff --git a/components/bootloader/Kconfig.projbuild b/components/bootloader/Kconfig.projbuild
index 50c7633cf..2e108b512 100644
--- a/components/bootloader/Kconfig.projbuild
+++ b/components/bootloader/Kconfig.projbuild
@@ -174,6 +174,15 @@ config BOOTLOADER_STORE_OFFSET
         bootloader of the SDK's bootloader, you can set the option to store SDK's bootloader
         to other space in the flash instead of "0x0".
 
+config BOOTLOADER_FLASH_XMC_SUPPORT
+    bool "Enable the support for flash chips of XMC (READ HELP FIRST)"
+    default y
+    help
+        Perform the startup flow recommended by XMC. Please consult XMC for the details of this flow.
+        XMC chips will be forbidden to be used, when this option is disabled.
+
+        DON'T DISABLE THIS UNLESS YOU KNOW WHAT YOU ARE DOING.
+
 endmenu  # Bootloader
 
 
diff --git a/components/bootloader/subproject/main/bootloader_start.c b/components/bootloader/subproject/main/bootloader_start.c
index 3ba0addee..d79496db8 100644
--- a/components/bootloader/subproject/main/bootloader_start.c
+++ b/components/bootloader/subproject/main/bootloader_start.c
@@ -22,6 +22,7 @@
 #include "esp_image_format.h"
 #include "esp_spi_flash.h"
 #include "esp_log.h"
+#include "driver/soc.h"
 
 static const char* TAG = "boot";
 
@@ -30,6 +31,11 @@ static int selected_boot_partition(const bootloader_state_t *bs);
 
 void call_start_cpu(void)
 {
+    esp_irqflag_t irq;
+
+    irq = soc_save_local_irq();
+    ESP_LOGD(TAG, "CPU local irq: 0x%x", irq);
+
 #ifdef CONFIG_BOOTLOADER_FAST_BOOT
     REG_SET_BIT(DPORT_CTL_REG, DPORT_CTL_DOUBLE_CLK);
 #endif
diff --git a/components/bootloader/subproject/main/esp8266.bootloader.rom.ld b/components/bootloader/subproject/main/esp8266.bootloader.rom.ld
index 3ff8f2710..27d35bbee 100644
--- a/components/bootloader/subproject/main/esp8266.bootloader.rom.ld
+++ b/components/bootloader/subproject/main/esp8266.bootloader.rom.ld
@@ -8,4 +8,5 @@ PROVIDE ( gpio_input_get = 0x40004cf0 );
 
 PROVIDE ( xthal_get_ccount = 0x4000dd38 );
 PROVIDE ( uart_div_modify = 0x400039d8 );
-PROVIDE ( ets_io_vprintf = 0x40001f00 );
\ No newline at end of file
+PROVIDE ( ets_io_vprintf = 0x40001f00 );
+PROVIDE ( ets_rom_delay_us = 0x40002ecc );
\ No newline at end of file
diff --git a/components/bootloader_support/include_priv/bootloader_flash.h b/components/bootloader_support/include_priv/bootloader_flash.h
index 763136e03..101a32752 100644
--- a/components/bootloader_support/include_priv/bootloader_flash.h
+++ b/components/bootloader_support/include_priv/bootloader_flash.h
@@ -22,6 +22,11 @@
 
 #define FLASH_SECTOR_SIZE 0x1000
 
+#define CMD_RDSFDP      0x5A /* Read the SFDP of the flash */
+#define CMD_RDJEDECID   0x9F /* Read the JEDEC ID of the flash */
+
+#define XMC_VENDOR_ID   0x20
+
 /* Provide a Flash API for bootloader_support code,
    that can be used from bootloader or app code.
 
@@ -100,4 +105,20 @@ esp_err_t bootloader_flash_write(size_t dest_addr, void *src, size_t size, bool
  */
 esp_err_t bootloader_flash_erase_sector(size_t sector);
 
+/**
+ * @brief Read the SFDP of the flash
+ *
+ * @param sfdp_addr Address of the parameter to read
+ * @param miso_byte_num Bytes to read
+ * @return The read SFDP, little endian, 4 bytes at most
+ */
+uint32_t bootloader_flash_read_sfdp(uint32_t sfdp_addr, unsigned int miso_byte_num);
+
+/**
+ * @brief Startup flow recommended by XMC. Call at startup before any erase/write operation.
+ *
+ * @return ESP_OK When startup successfully, otherwise ESP_FAIL (indiciating you should reboot before erase/write).
+ */
+esp_err_t bootloader_flash_xmc_startup(void);
+
 #endif
diff --git a/components/bootloader_support/src/bootloader_flash.c b/components/bootloader_support/src/bootloader_flash.c
index f93226b3a..47edf2126 100644
--- a/components/bootloader_support/src/bootloader_flash.c
+++ b/components/bootloader_support/src/bootloader_flash.c
@@ -263,9 +263,13 @@ esp_err_t bootloader_flash_erase_sector(size_t sector)
 
 #include "esp_err.h"
 #include "esp_log.h"
+#include "esp8266/rom_functions.h"
 
 #ifndef BOOTLOADER_BUILD
 #include "esp_spi_flash.h"
+#else
+#include "bootloader_flash.h"
+#include "priv/esp_spi_flash_raw.h"
 #endif
 
 #ifdef CONFIG_SOC_FULL_ICACHE
@@ -274,18 +278,11 @@ esp_err_t bootloader_flash_erase_sector(size_t sector)
 #define SOC_CACHE_SIZE 0 // 16KB
 #endif
 
-extern void Cache_Read_Disable();
-extern void Cache_Read_Enable(uint8_t map, uint8_t p, uint8_t v);
-
-static const char *TAG = "bootloader_flash";
+#define XMC_SUPPORT CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT
 
-typedef enum { SPI_FLASH_RESULT_OK = 0,
-               SPI_FLASH_RESULT_ERR = 1,
-               SPI_FLASH_RESULT_TIMEOUT = 2 } SpiFlashOpResult;
+#define BYTESHIFT(VAR, IDX)    (((VAR) >> ((IDX) * 8)) & 0xFF)
 
-SpiFlashOpResult SPIRead(uint32_t addr, void *dst, uint32_t size);
-SpiFlashOpResult SPIWrite(uint32_t addr, const uint8_t *src, uint32_t size);
-SpiFlashOpResult SPIEraseSector(uint32_t sector_num);
+static const char *TAG = "bootloader_flash";
 
 static bool mapped;
 
@@ -406,4 +403,150 @@ esp_err_t bootloader_flash_erase_sector(size_t sector)
     return ESP_OK;
 }
 
+#ifdef BOOTLOADER_BUILD
+uint32_t bootloader_read_flash_id(void)
+{
+    uint32_t id = spi_flash_get_id_raw(&g_rom_flashchip);
+    id = ((id & 0xff) << 16) | ((id >> 16) & 0xff) | (id & 0xff00);
+    return id;
+}
+
+#if XMC_SUPPORT
+static bool is_xmc_chip_strict(uint32_t rdid)
+{
+    uint32_t vendor_id = BYTESHIFT(rdid, 2);
+    uint32_t mfid = BYTESHIFT(rdid, 1);
+    uint32_t cpid = BYTESHIFT(rdid, 0);
+
+    if (vendor_id != XMC_VENDOR_ID) {
+        return false;
+    }
+
+    bool matched = false;
+    if (mfid == 0x40) {
+        if (cpid >= 0x13 && cpid <= 0x20) {
+            matched = true;
+        }
+    } else if (mfid == 0x41) {
+        if (cpid >= 0x17 && cpid <= 0x20) {
+            matched = true;
+        }
+    } else if (mfid == 0x50) {
+        if (cpid >= 0x15 && cpid <= 0x16) {
+            matched =  true;
+        }
+    }
+    return matched;
+}
+
+bool bootloader_execute_flash_command(uint8_t command, uint32_t mosi_data, uint8_t mosi_len, uint8_t miso_len)
+{
+    bool ret;
+    spi_cmd_t cmd;
+
+    cmd.cmd        = command;
+    cmd.cmd_len    = 1;
+    cmd.addr       = NULL;
+    cmd.addr_len   = 0;
+    cmd.dummy_bits = 0;
+    cmd.data       = NULL;
+    cmd.data_len   = 0;
+
+    ret = spi_user_cmd_raw(&g_rom_flashchip, SPI_TX, &cmd);
+    if (!ret) {
+        ESP_LOGE(TAG, "failed to write cmd=%02x", command);
+    }
+
+    return ret;
+}
+
+uint32_t bootloader_flash_read_sfdp(uint32_t sfdp_addr, unsigned int miso_byte_num)
+{
+    bool ret;
+    spi_cmd_t cmd;
+    uint32_t data = 0;
+    uint32_t addr = sfdp_addr << 8;
+
+    cmd.cmd        = CMD_RDSFDP;
+    cmd.cmd_len    = 1;
+    cmd.addr       = &addr;
+    cmd.addr_len   = 3;
+    cmd.dummy_bits = 8;
+    cmd.data       = &data;
+    cmd.data_len   = miso_byte_num;
+
+    ret = spi_user_cmd_raw(&g_rom_flashchip, SPI_RX, &cmd);
+    if (!ret) {
+        ESP_LOGE(TAG, "failed to read sfdp");
+    }
+
+    return data;
+}
+
+esp_err_t bootloader_flash_xmc_startup(void)
+{
+    extern void ets_rom_delay_us(uint16_t us);
+
+    uint32_t id = bootloader_read_flash_id();
+
+    // If the RDID value is a valid XMC one, may skip the flow
+    const bool fast_check = true;
+    if (fast_check && is_xmc_chip_strict(id)) {
+        ESP_LOGD(TAG, "XMC chip detected by RDID (%08X), skip.", id);
+        return ESP_OK;
+    }
+
+    // Check the Manufacturer ID in SFDP registers (JEDEC standard). If not XMC chip, no need to run the flow
+    const int sfdp_mfid_addr = 0x10;
+    uint8_t mf_id = (bootloader_flash_read_sfdp(sfdp_mfid_addr, 1) & 0xff);
+    if (mf_id != XMC_VENDOR_ID) {
+        ESP_LOGD(TAG, "non-XMC chip detected by SFDP Read (%02X), skip.", mf_id);
+        return ESP_OK;
+    }
+
+    ESP_LOGI(TAG, "XM25QHxxC startup flow");
+    // Enter DPD
+    bootloader_execute_flash_command(0xB9, 0, 0, 0);
+    // Enter UDPD
+    bootloader_execute_flash_command(0x79, 0, 0, 0);
+    // Exit UDPD
+    bootloader_execute_flash_command(0xFF, 0, 0, 0);
+    // Delay tXUDPD
+    ets_rom_delay_us(2000);
+    // Release Power-down
+    bootloader_execute_flash_command(0xAB, 0, 0, 0);
+    ets_rom_delay_us(20);
+    // Read flash ID and check again
+    id = bootloader_read_flash_id();
+    if (!is_xmc_chip_strict(id)) {
+        ESP_LOGE(TAG, "XMC flash startup fail");
+        return ESP_FAIL;
+    }
+
+    return ESP_OK;
+}
+#else
+static bool is_xmc_chip(uint32_t rdid)
+{
+    uint32_t vendor_id = (rdid >> 16) &0xff;
+    
+    return vendor_id == XMC_VENDOR_ID;
+}
+
+esp_err_t bootloader_flash_xmc_startup(void)
+{
+    uint32_t id = bootloader_read_flash_id();
+
+    if (is_xmc_chip(id)) {
+        ESP_LOGE(TAG, "XMC chip detected(%08X) while support disable.", id);
+        return ESP_FAIL;
+    } else {
+        ESP_LOGI(TAG, "flash chip is %08X", id);
+    }
+
+    return ESP_OK;
+}
+#endif
+#endif
+
 #endif
diff --git a/components/bootloader_support/src/bootloader_init.c b/components/bootloader_support/src/bootloader_init.c
index fda2a49f7..2ca04d11f 100644
--- a/components/bootloader_support/src/bootloader_init.c
+++ b/components/bootloader_support/src/bootloader_init.c
@@ -642,6 +642,8 @@ esp_err_t bootloader_init()
 
 static esp_err_t bootloader_main()
 {
+    esp_err_t ret;
+
 #ifdef CONFIG_BOOTLOADER_DISABLE_JTAG_IO
     /* Set GPIO 12-15 to be normal GPIO  */
     PIN_FUNC_SELECT(PERIPHS_IO_MUX_MTDI_U, FUNC_GPIO12);
@@ -655,6 +657,11 @@ static esp_err_t bootloader_main()
 
     uart_console_configure();
 
+    if ((ret = bootloader_flash_xmc_startup()) != ESP_OK) {
+        ESP_LOGE(TAG, "failed when running XMC startup flow, reboot!");
+        return ESP_FAIL;
+    }
+
     esp_image_header_t fhdr;
     if (bootloader_flash_read(ESP_BOOTLOADER_OFFSET, &fhdr, sizeof(esp_image_header_t), true) != ESP_OK) {
         ESP_LOGE(TAG, "failed to load bootloader header!");
diff --git a/components/coap/libcoap b/components/coap/libcoap
index cfec0d072..0dbccca06 160000
--- a/components/coap/libcoap
+++ b/components/coap/libcoap
@@ -1 +1 @@
-Subproject commit cfec0d072c5b99ed3e54828ca50ea2f6b91e1f50
+Subproject commit 0dbccca06c3ea75a20ef0a51633eb424a35b5e2a
diff --git a/components/esp-tls/esp_tls.c b/components/esp-tls/esp_tls.c
index da4dfe291..a5daf24f9 100644
--- a/components/esp-tls/esp_tls.c
+++ b/components/esp-tls/esp_tls.c
@@ -54,6 +54,7 @@ static const char *TAG = "esp-tls";
 #define _esp_tls_set_global_ca_store        esp_mbedtls_set_global_ca_store                 /*!< Callback function for setting global CA store data for TLS/SSL */
 #define _esp_tls_get_global_ca_store        esp_mbedtls_get_global_ca_store
 #define _esp_tls_free_global_ca_store       esp_mbedtls_free_global_ca_store                /*!< Callback function for freeing global ca store for TLS/SSL */
+#define _esp_tls_get_ciphersuites_list      esp_mbedtls_get_ciphersuites_list
 #elif CONFIG_ESP_TLS_USING_WOLFSSL /* CONFIG_ESP_TLS_USING_MBEDTLS */
 #define _esp_create_ssl_handle              esp_create_wolfssl_handle
 #define _esp_tls_handshake                  esp_wolfssl_handshake
@@ -437,6 +438,10 @@ mbedtls_x509_crt *esp_tls_get_global_ca_store(void)
     return _esp_tls_get_global_ca_store();
 }
 
+const int *esp_tls_get_ciphersuites_list(void)
+{
+    return _esp_tls_get_ciphersuites_list();
+}
 #endif /* CONFIG_ESP_TLS_USING_MBEDTLS */
 #ifdef CONFIG_ESP_TLS_SERVER
 /**
diff --git a/components/esp-tls/esp_tls.h b/components/esp-tls/esp_tls.h
index a5983b2e3..a9ff17d5d 100644
--- a/components/esp-tls/esp_tls.h
+++ b/components/esp-tls/esp_tls.h
@@ -200,7 +200,8 @@ typedef struct esp_tls_cfg {
     esp_err_t (*crt_bundle_attach)(void *conf);
                                             /*!< Function pointer to esp_crt_bundle_attach. Enables the use of certification
                                                  bundle for server verification, must be enabled in menuconfig */
-
+    const int *ciphersuites_list;           /*!< Pointer to a zero-terminated array of IANA identifiers of TLS ciphersuites.
+                                                Please check the list validity by esp_tls_get_ciphersuites_list() API */
 } esp_tls_cfg_t;
 
 #ifdef CONFIG_ESP_TLS_SERVER
@@ -574,6 +575,15 @@ esp_err_t esp_tls_get_and_clear_last_error(esp_tls_error_handle_t h, int *esp_tl
  */
 mbedtls_x509_crt *esp_tls_get_global_ca_store(void);
 
+/**
+ * @brief Get supported TLS ciphersuites list.
+ *
+ * See https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-4 for the list of ciphersuites
+ *
+ * @return  Pointer to a zero-terminated array of IANA identifiers of TLS ciphersuites.
+ *
+ */
+const int *esp_tls_get_ciphersuites_list(void);
 #endif /* CONFIG_ESP_TLS_USING_MBEDTLS */
 #ifdef CONFIG_ESP_TLS_SERVER
 /**
@@ -602,7 +612,6 @@ int esp_tls_server_session_create(esp_tls_cfg_server_t *cfg, int sockfd, esp_tls
  */
 void esp_tls_server_session_delete(esp_tls_t *tls);
 #endif /* ! CONFIG_ESP_TLS_SERVER */
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/components/esp-tls/esp_tls_mbedtls.c b/components/esp-tls/esp_tls_mbedtls.c
index 9a7a45e69..3fb0678fc 100644
--- a/components/esp-tls/esp_tls_mbedtls.c
+++ b/components/esp-tls/esp_tls_mbedtls.c
@@ -473,6 +473,11 @@ esp_err_t set_client_config(const char *hostname, size_t hostlen, esp_tls_cfg_t
         ESP_LOGE(TAG, "You have to provide both clientcert_buf and clientkey_buf for mutual authentication");
         return ESP_ERR_INVALID_STATE;
     }
+
+    if (cfg->ciphersuites_list != NULL && cfg->ciphersuites_list[0] != 0) {
+        ESP_LOGD(TAG, "Set the ciphersuites list");
+        mbedtls_ssl_conf_ciphersuites(&tls->conf, cfg->ciphersuites_list);
+    }
     return ESP_OK;
 }
 
@@ -569,3 +574,8 @@ void esp_mbedtls_free_global_ca_store(void)
         global_cacert = NULL;
     }
 }
+
+const int *esp_mbedtls_get_ciphersuites_list(void)
+{
+    return mbedtls_ssl_list_ciphersuites();
+}
diff --git a/components/esp-tls/private_include/esp_tls_mbedtls.h b/components/esp-tls/private_include/esp_tls_mbedtls.h
index 362a71fd6..4e542cbe6 100644
--- a/components/esp-tls/private_include/esp_tls_mbedtls.h
+++ b/components/esp-tls/private_include/esp_tls_mbedtls.h
@@ -102,3 +102,8 @@ mbedtls_x509_crt *esp_mbedtls_get_global_ca_store(void);
  * Callback function for freeing global ca store for TLS/SSL using mbedtls
  */
 void esp_mbedtls_free_global_ca_store(void);
+
+/**
+ * Internal Callback for esp_tls_get_ciphersuites_list
+ */
+const int *esp_mbedtls_get_ciphersuites_list(void);
diff --git a/components/esp8266/CMakeLists.txt b/components/esp8266/CMakeLists.txt
index 26120f438..887f9b6e6 100644
--- a/components/esp8266/CMakeLists.txt
+++ b/components/esp8266/CMakeLists.txt
@@ -69,7 +69,12 @@ else()
     target_link_libraries(${COMPONENT_LIB} PUBLIC "-L ${CMAKE_CURRENT_SOURCE_DIR}/lib" "-lstdc++")
     target_compile_definitions(${COMPONENT_LIB} PUBLIC -DUSING_IBUS_FASTER_GET)
     if(NOT CONFIG_NO_BLOBS)
-        set(blobs "gcc" "hal" "core" "net80211" "phy" "rtc" "clk" "pp" "smartconfig" "ssc" "espnow")
+        set(blobs "gcc" "hal" "phy" "rtc" "clk" "smartconfig" "ssc")
+        if(CONFIG_ESP8266_WIFI_DEBUG_LOG_ENABLE)
+            list(APPEND blobs "core_dbg" "net80211_dbg" "pp_dbg" "espnow_dbg")
+        else()
+            list(APPEND blobs "core" "net80211" "pp" "espnow")
+        endif()
         foreach(blob ${blobs})
             add_library(${blob} STATIC IMPORTED)
             set_property(TARGET ${blob} PROPERTY IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/lib/lib${blob}.a)
diff --git a/components/esp8266/include/driver/soc.h b/components/esp8266/include/driver/soc.h
index ac3e330de..894f64e95 100644
--- a/components/esp8266/include/driver/soc.h
+++ b/components/esp8266/include/driver/soc.h
@@ -31,7 +31,11 @@ static inline esp_irqflag_t soc_save_local_irq(void)
     esp_irqflag_t flag;
 
     __asm__ __volatile__(
+#ifdef BOOTLOADER_BUILD
+            "rsil   %0, 3\n"
+#else
             "rsil   %0, 1\n"
+#endif
             : "=a"(flag)
             :
             : "memory"
diff --git a/components/esp8266/lib/VERSION b/components/esp8266/lib/VERSION
index c3603cc7f..2873e0c84 100644
--- a/components/esp8266/lib/VERSION
+++ b/components/esp8266/lib/VERSION
@@ -1,8 +1,8 @@
 gwen:
     core:       231e0e2
-    net80211:   231e0e2
-    pp:         231e0e2
+    net80211:   9ad2f23
+    pp:         25e5ef2
     espnow:     231e0e2
 
     smartconfig:  3.0.0/af78f443
-    phy:          1163.0
+    phy:          1166.0
diff --git a/components/esp8266/lib/libnet80211.a b/components/esp8266/lib/libnet80211.a
old mode 100755
new mode 100644
index 375abf985..a6da69b90
Binary files a/components/esp8266/lib/libnet80211.a and b/components/esp8266/lib/libnet80211.a differ
diff --git a/components/esp8266/lib/libnet80211_dbg.a b/components/esp8266/lib/libnet80211_dbg.a
old mode 100755
new mode 100644
index f33aee19b..d74f6f5c7
Binary files a/components/esp8266/lib/libnet80211_dbg.a and b/components/esp8266/lib/libnet80211_dbg.a differ
diff --git a/components/esp8266/lib/libphy.a b/components/esp8266/lib/libphy.a
old mode 100755
new mode 100644
index 3113a722c..6f3b75e93
Binary files a/components/esp8266/lib/libphy.a and b/components/esp8266/lib/libphy.a differ
diff --git a/components/esp8266/lib/libpp.a b/components/esp8266/lib/libpp.a
old mode 100755
new mode 100644
index 143e90d2e..de9333380
Binary files a/components/esp8266/lib/libpp.a and b/components/esp8266/lib/libpp.a differ
diff --git a/components/esp8266/lib/libpp_dbg.a b/components/esp8266/lib/libpp_dbg.a
old mode 100755
new mode 100644
index 6c9f81430..89786fcc4
Binary files a/components/esp8266/lib/libpp_dbg.a and b/components/esp8266/lib/libpp_dbg.a differ
diff --git a/components/esp8266/lib/librtc.a b/components/esp8266/lib/librtc.a
old mode 100755
new mode 100644
index cfb64443c..8a809ee92
Binary files a/components/esp8266/lib/librtc.a and b/components/esp8266/lib/librtc.a differ
diff --git a/components/esp8266/source/startup.c b/components/esp8266/source/startup.c
index b9e582cec..42fc18825 100644
--- a/components/esp8266/source/startup.c
+++ b/components/esp8266/source/startup.c
@@ -93,6 +93,10 @@ static void user_init_entry(void *param)
     esp_set_cpu_freq(ESP_CPU_FREQ_160M);
 #endif
 
+#ifdef CONFIG_ENABLE_TH25Q16HB_PATCH_0
+    assert(th25q16hb_apply_patch_0() == 0);
+#endif
+
     app_main();
 
     vTaskDelete(NULL);
diff --git a/components/esp_http_server/src/httpd_main.c b/components/esp_http_server/src/httpd_main.c
index a67513195..5724383aa 100644
--- a/components/esp_http_server/src/httpd_main.c
+++ b/components/esp_http_server/src/httpd_main.c
@@ -262,6 +262,16 @@ static esp_err_t httpd_server_init(struct httpd_data *hd)
         .sin_port     = htons(hd->config.server_port)
     };
 #endif /* CONFIG_LWIP_IPV6 */
+
+    /* Enable SO_REUSEADDR to allow binding to the same
+     * address and port when restarting the server */
+    int enable = 1;
+    if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable)) < 0) {
+        /* This will fail if CONFIG_LWIP_SO_REUSE is not enabled. But
+         * it does not affect the normal working of the HTTP Server */
+        ESP_LOGW(TAG, LOG_FMT("error in setsockopt SO_REUSEADDR (%d)"), errno);
+    }
+
     int ret = bind(fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr));
     if (ret < 0) {
         ESP_LOGE(TAG, LOG_FMT("error in bind (%d)"), errno);
diff --git a/components/freertos/freertos/tasks.c b/components/freertos/freertos/tasks.c
index c747cd74e..61e10e501 100644
--- a/components/freertos/freertos/tasks.c
+++ b/components/freertos/freertos/tasks.c
@@ -3044,6 +3044,19 @@ BaseType_t xReturn;
 	{
 		( void ) uxListRemove( &( pxUnblockedTCB->xStateListItem ) );
 		prvAddTaskToReadyList( pxUnblockedTCB );
+		#if( configUSE_TICKLESS_IDLE != 0 )
+		{
+			/* If a task is blocked on a kernel object then xNextTaskUnblockTime
+			might be set to the blocked task's time out time.  If the task is
+			unblocked for a reason other than a timeout xNextTaskUnblockTime is
+			normally left unchanged, because it is automatically reset to a new
+			value when the tick count equals xNextTaskUnblockTime.  However if
+			tickless idling is used it might be more important to enter sleep mode
+			at the earliest possible time - so reset xNextTaskUnblockTime here to
+			ensure it is updated at the earliest possible time. */
+			prvResetNextTaskUnblockTime();
+		}
+		#endif
 	}
 	else
 	{
@@ -3068,20 +3081,6 @@ BaseType_t xReturn;
 		xReturn = pdFALSE;
 	}
 
-	#if( configUSE_TICKLESS_IDLE != 0 )
-	{
-		/* If a task is blocked on a kernel object then xNextTaskUnblockTime
-		might be set to the blocked task's time out time.  If the task is
-		unblocked for a reason other than a timeout xNextTaskUnblockTime is
-		normally left unchanged, because it is automatically reset to a new
-		value when the tick count equals xNextTaskUnblockTime.  However if
-		tickless idling is used it might be more important to enter sleep mode
-		at the earliest possible time - so reset xNextTaskUnblockTime here to
-		ensure it is updated at the earliest possible time. */
-		prvResetNextTaskUnblockTime();
-	}
-	#endif
-
 	return xReturn;
 }
 /*-----------------------------------------------------------*/
diff --git a/components/libsodium/libsodium/test/default/sign.c b/components/libsodium/libsodium/test/default/sign.c
index 814f96729..4faacf368 100644
--- a/components/libsodium/libsodium/test/default/sign.c
+++ b/components/libsodium/libsodium/test/default/sign.c
@@ -14,7 +14,7 @@ typedef struct TestData_ {
     const char          *m;
 } TestData;
 
-static TestData test_data[] = {
+static const TestData test_data[] = {
 {{0x9d,0x61,0xb1,0x9d,0xef,0xfd,0x5a,0x60,0xba,0x84,0x4a,0xf4,0x92,0xec,0x2c,0xc4,0x44,0x49,0xc5,0x69,0x7b,0x32,0x69,0x19,0x70,0x3b,0xac,0x03,0x1c,0xae,0x7f,0x60,},{0xd7,0x5a,0x98,0x01,0x82,0xb1,0x0a,0xb7,0xd5,0x4b,0xfe,0xd3,0xc9,0x64,0x07,0x3a,0x0e,0xe1,0x72,0xf3,0xda,0xa6,0x23,0x25,0xaf,0x02,0x1a,0x68,0xf7,0x07,0x51,0x1a,},{0xe5,0x56,0x43,0x00,0xc3,0x60,0xac,0x72,0x90,0x86,0xe2,0xcc,0x80,0x6e,0x82,0x8a,0x84,0x87,0x7f,0x1e,0xb8,0xe5,0xd9,0x74,0xd8,0x73,0xe0,0x65,0x22,0x49,0x01,0x55,0x5f,0xb8,0x82,0x15,0x90,0xa3,0x3b,0xac,0xc6,0x1e,0x39,0x70,0x1c,0xf9,0xb4,0x6b,0xd2,0x5b,0xf5,0xf0,0x59,0x5b,0xbe,0x24,0x65,0x51,0x41,0x43,0x8e,0x7a,0x10,0x0b,},""},
 {{0x4c,0xcd,0x08,0x9b,0x28,0xff,0x96,0xda,0x9d,0xb6,0xc3,0x46,0xec,0x11,0x4e,0x0f,0x5b,0x8a,0x31,0x9f,0x35,0xab,0xa6,0x24,0xda,0x8c,0xf6,0xed,0x4f,0xb8,0xa6,0xfb,},{0x3d,0x40,0x17,0xc3,0xe8,0x43,0x89,0x5a,0x92,0xb7,0x0a,0xa7,0x4d,0x1b,0x7e,0xbc,0x9c,0x98,0x2c,0xcf,0x2e,0xc4,0x96,0x8c,0xc0,0xcd,0x55,0xf1,0x2a,0xf4,0x66,0x0c,},{0x92,0xa0,0x09,0xa9,0xf0,0xd4,0xca,0xb8,0x72,0x0e,0x82,0x0b,0x5f,0x64,0x25,0x40,0xa2,0xb2,0x7b,0x54,0x16,0x50,0x3f,0x8f,0xb3,0x76,0x22,0x23,0xeb,0xdb,0x69,0xda,0x08,0x5a,0xc1,0xe4,0x3e,0x15,0x99,0x6e,0x45,0x8f,0x36,0x13,0xd0,0xf1,0x1d,0x8c,0x38,0x7b,0x2e,0xae,0xb4,0x30,0x2a,0xee,0xb0,0x0d,0x29,0x16,0x12,0xbb,0x0c,0x00,},"\x72"},
 {{0xc5,0xaa,0x8d,0xf4,0x3f,0x9f,0x83,0x7b,0xed,0xb7,0x44,0x2f,0x31,0xdc,0xb7,0xb1,0x66,0xd3,0x85,0x35,0x07,0x6f,0x09,0x4b,0x85,0xce,0x3a,0x2e,0x0b,0x44,0x58,0xf7,},{0xfc,0x51,0xcd,0x8e,0x62,0x18,0xa1,0xa3,0x8d,0xa4,0x7e,0xd0,0x02,0x30,0xf0,0x58,0x08,0x16,0xed,0x13,0xba,0x33,0x03,0xac,0x5d,0xeb,0x91,0x15,0x48,0x90,0x80,0x25,},{0x62,0x91,0xd6,0x57,0xde,0xec,0x24,0x02,0x48,0x27,0xe6,0x9c,0x3a,0xbe,0x01,0xa3,0x0c,0xe5,0x48,0xa2,0x84,0x74,0x3a,0x44,0x5e,0x36,0x80,0xd7,0xdb,0x5a,0xc3,0xac,0x18,0xff,0x9b,0x53,0x8d,0x16,0xf2,0x90,0xae,0x67,0xf7,0x60,0x98,0x4d,0xc6,0x59,0x4a,0x7c,0x15,0xe9,0x71,0x6e,0xd2,0x8d,0xc0,0x27,0xbe,0xce,0xea,0x1e,0xc4,0x0a,},"\xaf\x82"},
diff --git a/components/nvs_flash/host_test/fixtures/test_fixtures.hpp b/components/nvs_flash/host_test/fixtures/test_fixtures.hpp
index 0baef7d3f..b0915682f 100644
--- a/components/nvs_flash/host_test/fixtures/test_fixtures.hpp
+++ b/components/nvs_flash/host_test/fixtures/test_fixtures.hpp
@@ -52,7 +52,7 @@ class PartitionMock : public nvs::Partition {
 
     esp_err_t read_raw(size_t src_offset, void* dst, size_t size) override
     {
-        return esp_partition_read(&partition, src_offset, dst, size);
+        return esp_partition_read_raw(&partition, src_offset, dst, size);
     }
 
     esp_err_t read(size_t src_offset, void* dst, size_t size) override
@@ -62,7 +62,7 @@ class PartitionMock : public nvs::Partition {
 
     esp_err_t write_raw(size_t dst_offset, const void* src, size_t size) override
     {
-        return esp_partition_write(&partition, dst_offset, src, size);
+        return esp_partition_write_raw(&partition, dst_offset, src, size);
     }
 
     esp_err_t write(size_t dst_offset, const void* src, size_t size) override
@@ -122,6 +122,9 @@ struct PartitionMockFixture {
             const char *partition_name = NVS_DEFAULT_PART_NAME)
         : part_mock(start_sector * SPI_FLASH_SEC_SIZE, sector_size * SPI_FLASH_SEC_SIZE) {
         std::fill_n(raw_header, sizeof(raw_header)/sizeof(raw_header[0]), UINT8_MAX);
+
+        // This resets the mocks and prevents meeting accidental expectations from previous tests.
+        Mockesp_partition_Init();
     }
 
     ~PartitionMockFixture() { }
@@ -151,7 +154,7 @@ struct NVSPageFixture : public PartitionMockFixture {
     nvs::Page page;
 };
 
-struct NVSValidPageFixture : public PartitionMockFixture {
+struct NVSValidPageFlashFixture : public PartitionMockFixture {
     const static uint8_t NS_INDEX = 1;
 
     // valid header
@@ -164,7 +167,7 @@ struct NVSValidPageFixture : public PartitionMockFixture {
 
     uint8_t value_entry [32];
 
-    NVSValidPageFixture(uint32_t start_sector = 0,
+    NVSValidPageFlashFixture(uint32_t start_sector = 0,
             uint32_t sector_size = 1,
             const char *partition_name = NVS_DEFAULT_PART_NAME)
         : PartitionMockFixture(start_sector, sector_size, partition_name),
@@ -173,8 +176,7 @@ struct NVSValidPageFixture : public PartitionMockFixture {
         ns_entry {0x00, 0x01, 0x01, 0xff, 0x68, 0xc5, 0x3f, 0x0b, 't', 'e', 's', 't', '_', 'n', 's', '\0',
                 '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', 1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
         value_entry {0x01, 0x01, 0x01, 0xff, 0x3d, 0xf3, 0x99, 0xe5, 't', 'e', 's', 't', '_', 'v', 'a', 'l',
-                'u', 'e', '\0', '\0', '\0', '\0', '\0', '\0', 47, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-        page()
+                'u', 'e', '\0', '\0', '\0', '\0', '\0', '\0', 47, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}
     {
         std::fill_n(raw_entry_table, sizeof(raw_entry_table)/sizeof(raw_entry_table[0]), 0);
         raw_entry_table[0] = 0xfa;
@@ -202,7 +204,15 @@ struct NVSValidPageFixture : public PartitionMockFixture {
         // read normal entry second time during duplicated entry check
         esp_partition_read_ExpectAnyArgsAndReturn(ESP_OK);
         esp_partition_read_ReturnArrayThruPtr_dst(value_entry, 32);
+    }
+};
 
+struct NVSValidPageFixture : public NVSValidPageFlashFixture {
+    NVSValidPageFixture(uint32_t start_sector = 0,
+            uint32_t sector_size = 1,
+            const char *partition_name = NVS_DEFAULT_PART_NAME)
+        : NVSValidPageFlashFixture(start_sector, sector_size, partition_name), page()
+    {
         if (page.load(&part_mock, start_sector) != ESP_OK) throw FixtureException("couldn't setup page");
     }
 
@@ -392,9 +402,6 @@ struct NVSFullPageFixture : public PartitionMockFixture {
                 'u', 'e', '\0', '\0', '\0', '\0', '\0', '\0', 47, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
         page()
     {
-        std::fill_n(raw_entry_table, sizeof(raw_entry_table)/sizeof(raw_entry_table[0]), 0);
-        raw_entry_table[0] = 0xfa;
-
         // entry_table with all elements deleted except the namespace entry written and the last entry free
         std::fill_n(raw_entry_table, sizeof(raw_entry_table)/sizeof(raw_entry_table[0]), 0);
         raw_entry_table[0] = 0x0a;
diff --git a/components/nvs_flash/host_test/nvs_page_test/main/nvs_page_test.cpp b/components/nvs_flash/host_test/nvs_page_test/main/nvs_page_test.cpp
index d3899be78..e5ca9ed08 100644
--- a/components/nvs_flash/host_test/nvs_page_test/main/nvs_page_test.cpp
+++ b/components/nvs_flash/host_test/nvs_page_test/main/nvs_page_test.cpp
@@ -1,11 +1,16 @@
-/* Hello World Example
-
-   This example code is in the Public Domain (or CC0 licensed, at your option.)
-
-   Unless required by applicable law or agreed to in writing, this
-   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-   CONDITIONS OF ANY KIND, either express or implied.
-*/
+// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 #include <stdio.h>
 #include "unity.h"
 #include "test_fixtures.hpp"
@@ -25,6 +30,8 @@ void test_Page_load_reading_header_fails()
 
     TEST_ASSERT_EQUAL(Page::PageState::INVALID, page.state());
     TEST_ASSERT_EQUAL(ESP_ERR_INVALID_ARG, page.load(&mock, 0));
+
+    Mockesp_partition_Verify();
 }
 
 void test_Page_load_reading_data_fails()
@@ -39,6 +46,8 @@ void test_Page_load_reading_data_fails()
 
     TEST_ASSERT_EQUAL(Page::PageState::INVALID, page.state());
     TEST_ASSERT_EQUAL(ESP_FAIL, page.load(&mock, 0));
+
+    Mockesp_partition_Verify();
 }
 
 void test_Page_load__uninitialized_page_has_0xfe()
@@ -57,6 +66,8 @@ void test_Page_load__uninitialized_page_has_0xfe()
     TEST_ASSERT_EQUAL(ESP_OK, page.load(&fix.part_mock, 0));
 
     TEST_ASSERT_EQUAL(Page::PageState::CORRUPT, page.state());
+
+    Mockesp_partition_Verify();
 }
 
 void test_Page_load__initialized_corrupt_header()
@@ -74,6 +85,60 @@ void test_Page_load__initialized_corrupt_header()
     TEST_ASSERT_EQUAL(ESP_OK, page.load(&fix.part_mock, 0));
 
     TEST_ASSERT_EQUAL(Page::PageState::CORRUPT, page.state());
+
+    Mockesp_partition_Verify();
+}
+
+void test_Page_load__corrupt_entry_table()
+{
+    PartitionMockFixture fix;
+
+    // valid header
+    uint8_t raw_header_valid [32] = {0xfe, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc2, 0x16, 0xdd, 0xdc};
+
+    // entry table with one entry
+    uint8_t raw_entry_table [32];
+
+    uint8_t ns_entry [32] = {0x00, 0x01, 0x01, 0xff, 0x68, 0xc5, 0x3f, 0x0b, 't', 'e', 's', 't', '_', 'n', 's', '\0',
+                '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', 1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+
+    uint8_t raw_header[4] = {0xff, 0xff, 0xff, 0xff};
+    std::fill_n(raw_entry_table, sizeof(raw_entry_table)/sizeof(raw_entry_table[0]), 0);
+    raw_entry_table[0] = 0xfa;
+
+    // read page header
+    esp_partition_read_raw_ExpectAnyArgsAndReturn(ESP_OK);
+    esp_partition_read_raw_ReturnArrayThruPtr_dst(raw_header_valid, 32);
+
+    // read entry table
+    esp_partition_read_raw_ExpectAnyArgsAndReturn(ESP_OK);
+    esp_partition_read_raw_ReturnArrayThruPtr_dst(raw_entry_table, 32);
+
+    // read next free entry's header
+    esp_partition_read_raw_ExpectAnyArgsAndReturn(ESP_OK);
+    esp_partition_read_raw_ReturnArrayThruPtr_dst(raw_header, 4);
+
+    // read namespace entry
+    esp_partition_read_ExpectAnyArgsAndReturn(ESP_OK);
+    esp_partition_read_ReturnArrayThruPtr_dst(ns_entry, 32);
+
+    // we expect a raw word write from the partition in order to change the entry bits to erased (0)
+    esp_partition_write_raw_ExpectAndReturn(&fix.part_mock.partition, 32, nullptr, 4, ESP_OK);
+    esp_partition_write_raw_IgnoreArg_src();
+
+    // corrupt entry table as well as crc of corresponding item
+    raw_entry_table[0] = 0xf6;
+
+    Page page;
+
+    // Page::load() should return ESP_OK, but state has to be corrupt
+    TEST_ASSERT_EQUAL(ESP_OK, page.load(&fix.part_mock, 0));
+
+    TEST_ASSERT_EQUAL(Page::PageState::ACTIVE, page.state());
+    TEST_ASSERT_EQUAL(1, page.getUsedEntryCount());
+
+    Mockesp_partition_Verify();
 }
 
 void test_Page_load_success()
@@ -881,6 +946,7 @@ int main(int argc, char **argv)
     RUN_TEST(test_Page_load_reading_data_fails);
     RUN_TEST(test_Page_load__uninitialized_page_has_0xfe);
     RUN_TEST(test_Page_load__initialized_corrupt_header);
+    RUN_TEST(test_Page_load__corrupt_entry_table);
     RUN_TEST(test_Page_load_success);
     RUN_TEST(test_Page_load_full_page);
     RUN_TEST(test_Page_load__seq_number_0);
@@ -929,6 +995,6 @@ int main(int argc, char **argv)
     RUN_TEST(test_Page_calcEntries__active_wo_blob);
     RUN_TEST(test_Page_calcEntries__active_with_blob);
     RUN_TEST(test_Page_calcEntries__invalid);
-    UNITY_END();
-    return 0;
+    int failures = UNITY_END();
+    return failures;
 }
diff --git a/components/nvs_flash/src/nvs_item_hash_list.cpp b/components/nvs_flash/src/nvs_item_hash_list.cpp
index 7e1c1241a..21bf8b315 100644
--- a/components/nvs_flash/src/nvs_item_hash_list.cpp
+++ b/components/nvs_flash/src/nvs_item_hash_list.cpp
@@ -65,7 +65,7 @@ esp_err_t HashList::insert(const Item& item, size_t index)
     return ESP_OK;
 }
 
-void HashList::erase(size_t index, bool itemShouldExist)
+bool HashList::erase(size_t index)
 {
     for (auto it = mBlockList.begin(); it != mBlockList.end();) {
         bool haveEntries = false;
@@ -81,7 +81,7 @@ void HashList::erase(size_t index, bool itemShouldExist)
             }
             if (haveEntries && foundIndex) {
                 /* item was found, and HashListBlock still has some items */
-                return;
+                return true;
             }
         }
         /* no items left in HashListBlock, can remove */
@@ -95,12 +95,12 @@ void HashList::erase(size_t index, bool itemShouldExist)
         }
         if (foundIndex) {
             /* item was found and empty HashListBlock was removed */
-            return;
+            return true;
         }
     }
-    if (itemShouldExist) {
-        assert(false && "item should have been present in cache");
-    }
+
+    // item hasn't been present in cache");
+    return false;
 }
 
 size_t HashList::find(size_t start, const Item& item)
diff --git a/components/nvs_flash/src/nvs_item_hash_list.hpp b/components/nvs_flash/src/nvs_item_hash_list.hpp
index ca21c92c1..e724c4f02 100644
--- a/components/nvs_flash/src/nvs_item_hash_list.hpp
+++ b/components/nvs_flash/src/nvs_item_hash_list.hpp
@@ -29,7 +29,7 @@ class HashList
     ~HashList();
 
     esp_err_t insert(const Item& item, size_t index);
-    void erase(const size_t index, bool itemShouldExist=true);
+    bool erase(const size_t index);
     size_t find(size_t start, const Item& item);
     void clear();
 
diff --git a/components/nvs_flash/src/nvs_page.cpp b/components/nvs_flash/src/nvs_page.cpp
index 600759fe8..0be9960f5 100644
--- a/components/nvs_flash/src/nvs_page.cpp
+++ b/components/nvs_flash/src/nvs_page.cpp
@@ -393,8 +393,9 @@ esp_err_t Page::findItem(uint8_t nsIndex, ItemType datatype, const char* key, ui
 
 esp_err_t Page::eraseEntryAndSpan(size_t index)
 {
+    uint32_t seq_num;
+    getSeqNumber(seq_num);
     auto state = mEntryTable.get(index);
-    assert(state == EntryState::WRITTEN || state == EntryState::EMPTY);
 
     size_t span = 1;
     if (state == EntryState::WRITTEN) {
@@ -404,7 +405,7 @@ esp_err_t Page::eraseEntryAndSpan(size_t index)
             return rc;
         }
         if (item.calculateCrc32() != item.crc32) {
-            mHashList.erase(index, false);
+            mHashList.erase(index);
             rc = alterEntryState(index, EntryState::ERASED);
             --mUsedEntryCount;
             ++mErasedEntryCount;
@@ -601,6 +602,16 @@ esp_err_t Page::mLoadEntryTable()
                 continue;
             }
 
+            if (mEntryTable.get(i) == static_cast<EntryState>(0x1)) {
+                lastItemIndex = INVALID_ENTRY;
+                auto err = eraseEntryAndSpan(i);
+                if (err != ESP_OK) {
+                    mState = PageState::INVALID;
+                    return err;
+                }
+                continue;
+            }
+
             lastItemIndex = i;
 
             auto err = readEntry(i, item);
diff --git a/components/nvs_flash/test_nvs_host/test_nvs.cpp b/components/nvs_flash/test_nvs_host/test_nvs.cpp
index d8467dfe5..b7a2110a2 100644
--- a/components/nvs_flash/test_nvs_host/test_nvs.cpp
+++ b/components/nvs_flash/test_nvs_host/test_nvs.cpp
@@ -313,7 +313,8 @@ TEST_CASE("HashList is cleaned up as soon as items are erased", "[nvs]")
     INFO("Added " << count << " items, " << hashlist.getBlockCount() << " blocks");
     // Remove them in reverse order
     for (size_t i = count; i > 0; --i) {
-        hashlist.erase(i - 1, true);
+        // Make sure that the element existed before it's erased
+        CHECK(hashlist.erase(i - 1) == true);
     }
     CHECK(hashlist.getBlockCount() == 0);
     // Add again
@@ -326,7 +327,7 @@ TEST_CASE("HashList is cleaned up as soon as items are erased", "[nvs]")
     INFO("Added " << count << " items, " << hashlist.getBlockCount() << " blocks");
     // Remove them in the same order
     for (size_t i = 0; i < count; ++i) {
-        hashlist.erase(i, true);
+        CHECK(hashlist.erase(i) == true);
     }
     CHECK(hashlist.getBlockCount() == 0);
 }
diff --git a/components/spi_flash/CMakeLists.txt b/components/spi_flash/CMakeLists.txt
index b2a0f715c..255eff8e7 100644
--- a/components/spi_flash/CMakeLists.txt
+++ b/components/spi_flash/CMakeLists.txt
@@ -5,6 +5,10 @@ if(BOOTLOADER_BUILD)
     set(srcs "${srcs}" "port/port.c")
     set(priv_requires "bootloader_support")
 else()
+    if(CONFIG_ENABLE_TH25Q16HB_PATCH_0)
+        list(APPEND srcs "src/patch/th25q16hb.c")
+    endif()
+
     set(priv_requires "esp8266" "freertos" "bootloader_support")
 endif()
 
diff --git a/components/spi_flash/Kconfig b/components/spi_flash/Kconfig
new file mode 100644
index 000000000..3d97ba109
--- /dev/null
+++ b/components/spi_flash/Kconfig
@@ -0,0 +1,12 @@
+menu "SPI Flash"
+
+    menu "Patch"
+        config ENABLE_TH25Q16HB_PATCH_0
+            bool "Enable TH25Q16HB Patch 0"
+            default n
+            help
+                WARNING: If you don't use TH25Q16HB, you must not enable this option.
+                         Although you use TH25Q16HB, you should ask your flash manufacturer
+                         if your flash need use this patch.
+    endmenu
+endmenu
diff --git a/components/spi_flash/component.mk b/components/spi_flash/component.mk
index f5eb97ca6..c4dfc940a 100644
--- a/components/spi_flash/component.mk
+++ b/components/spi_flash/component.mk
@@ -15,4 +15,8 @@ CFLAGS += -DPARTITION_QUEUE_HEADER=\"sys/queue.h\"
 ifdef IS_BOOTLOADER_BUILD
 COMPONENT_SRCDIRS += port
 COMPONENT_OBJS += port/port.o
+else
+ifdef CONFIG_ENABLE_TH25Q16HB_PATCH_0
+COMPONENT_SRCDIRS += src/patch
+endif
 endif
diff --git a/components/spi_flash/include/spi_flash.h b/components/spi_flash/include/spi_flash.h
index d51756d72..7dfeb6a24 100644
--- a/components/spi_flash/include/spi_flash.h
+++ b/components/spi_flash/include/spi_flash.h
@@ -204,6 +204,15 @@ int esp_patition_table_init_data(void *partition_info);
 int esp_patition_copy_ota1_to_ota0(const void *partition_info);
 #endif
 
+#ifdef CONFIG_ENABLE_TH25Q16HB_PATCH_0
+/**
+ * @brief Apply TH25Q16HB patch 0 to avoid some hardware issues.
+ *
+ * @return 0 if success or others if failed
+ */
+int th25q16hb_apply_patch_0(void);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/components/spi_flash/linker.lf b/components/spi_flash/linker.lf
index 9ac365ea5..27695eb70 100644
--- a/components/spi_flash/linker.lf
+++ b/components/spi_flash/linker.lf
@@ -2,3 +2,4 @@
 archive: libspi_flash.a
 entries:
     spi_flash_raw (noflash)
+    th25q16hb (noflash)
diff --git a/components/spi_flash/src/patch/th25q16hb.c b/components/spi_flash/src/patch/th25q16hb.c
new file mode 100644
index 000000000..425096f9b
--- /dev/null
+++ b/components/spi_flash/src/patch/th25q16hb.c
@@ -0,0 +1,709 @@
+// Copyright 2023 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <stdlib.h>
+#include <string.h>
+#include <sys/param.h>
+#include <sys/errno.h>
+
+#include "esp_log.h"
+#include "esp_attr.h"
+#include "spi_flash.h"
+#include "priv/esp_spi_flash_raw.h"
+#include "FreeRTOS.h"
+
+#include "esp8266/eagle_soc.h"
+#include "esp8266/pin_mux_register.h"
+#include "esp8266/spi_register.h"
+#include "esp8266/spi_struct.h"
+
+#define SPI_FLASH       SPI0
+#define SPI_BLOCK_SIZE  32
+#define ADDR_SHIFT_BITS 8
+
+#if 0
+typedef int (*__ets_printf_t)(const char *fmt, ...); 
+#define ROM_PRINTF(_fmt, ...)   ((__ets_printf_t)(0x400024cc))(_fmt, ##__VA_ARGS__)
+#else
+#define ROM_PRINTF(_fmt, ...)
+#endif
+
+#define TOCHAR(_v)              #_v
+#define PRINT_STEP(_s)          ROM_PRINTF("Step %d\n", (_s));
+#define JUMP_TO_STEP(_s)        { ROM_PRINTF("Jump to " TOCHAR(_s) "\n"); goto _s; }
+#define GOTO_FAILED(_s)         { ROM_PRINTF("ERROR: " TOCHAR(_s) " failed\n"); ret = -EIO; JUMP_TO_STEP(step17); }
+
+#define write_u8_dummy(_c, _a, _d8,_d)          {uint32_t __data = _d8; spi_trans(1, (_c), 8, (_a), 24, (uint8_t *)&__data, 1, (_d));}
+#define write_u8(_c, _a, _d8)                   write_u8_dummy((_c), (_a), (_d8), 0)
+
+extern void Cache_Read_Disable_2(void);
+extern void Cache_Read_Enable_2();
+extern void vPortEnterCritical(void);
+extern void vPortExitCritical(void);
+extern uint32_t spi_flash_get_id(void);
+
+static void delay(int ms)
+{
+    for (volatile int i = 0; i < ms; i++) {
+        for (volatile int j = 0; j < 7800; j++) {
+        }
+    }
+}
+
+#if 0
+static void dump_hex(const uint8_t *ptr, int n)
+{
+  const uint8_t *s1 = ptr;
+  const int line_bytes = 16;
+
+  ROM_PRINTF("\nHex:\n");
+  for (int i = 0; i < n ; i += line_bytes)
+    {
+       int m = MIN(n - i, line_bytes);
+
+      ROM_PRINTF("\t");
+      for (int j = 0; j < m; j++)
+        {
+          ROM_PRINTF("%02x ", s1[i + j]);
+        }
+      
+      ROM_PRINTF("\n");
+    }
+
+  ROM_PRINTF("\n");
+}
+
+static void dump_hex_compare(const uint8_t *s1, const uint8_t *s2, int n)
+{
+  const int line_bytes = 16;
+
+  ROM_PRINTF("\nHex:\n");
+  for (int i = 0; i < n ; i += line_bytes)
+    {
+       int m = MIN(n - i, line_bytes);
+
+      ROM_PRINTF("\t");
+      for (int j = 0; j < m; j++)
+        {
+          ROM_PRINTF("%02x:%02x ", s1[i + j], s2[i + j]);
+        }
+      
+      ROM_PRINTF("\n");
+    }
+
+  ROM_PRINTF("\n");
+}
+#endif
+
+typedef struct spi_state {
+    uint32_t io_mux_reg;
+    uint32_t spi_clk_reg;
+    uint32_t spi_ctrl_reg;
+    uint32_t spi_user_reg;
+} spi_state_t;
+
+static void spi_enter(spi_state_t *state)
+{
+    vPortEnterCritical();
+    Cache_Read_Disable_2(); 
+
+    Wait_SPI_Idle(&g_rom_flashchip);
+
+    state->io_mux_reg = READ_PERI_REG(PERIPHS_IO_MUX_CONF_U);
+    state->spi_clk_reg = SPI_FLASH.clock.val;
+    state->spi_ctrl_reg = SPI_FLASH.ctrl.val;
+    state->spi_user_reg = SPI_FLASH.user.val;
+
+    SPI_FLASH.user.usr_command = 1;
+    SPI_FLASH.user.flash_mode = 0;
+    SPI_FLASH.user.usr_miso_highpart = 0;
+
+    CLEAR_PERI_REG_MASK(PERIPHS_IO_MUX_CONF_U, SPI0_CLK_EQU_SYS_CLK);
+
+    SPI_FLASH.user.cs_setup = 1;
+    SPI_FLASH.user.cs_hold = 1;
+    SPI_FLASH.user.usr_mosi = 1;
+
+    SPI_FLASH.user.usr_command = 1;
+    SPI_FLASH.user.flash_mode = 0;
+
+    SPI_FLASH.ctrl.fread_qio = 0;
+    SPI_FLASH.ctrl.fread_dio = 0;
+    SPI_FLASH.ctrl.fread_quad = 0;
+    SPI_FLASH.ctrl.fread_dual = 0;
+
+    SPI_FLASH.clock.val = 0;
+    SPI_FLASH.clock.clkcnt_l = 3;
+    SPI_FLASH.clock.clkcnt_h = 1;
+    SPI_FLASH.clock.clkcnt_n = 3;
+
+    SPI_FLASH.ctrl.fastrd_mode = 1;
+
+    while (SPI_FLASH.cmd.usr) {
+        ;
+    }
+}
+
+static void spi_exit(spi_state_t *state)
+{
+    while (SPI_FLASH.cmd.usr) {
+        ;
+    }
+
+    WRITE_PERI_REG(PERIPHS_IO_MUX_CONF_U, state->io_mux_reg);
+
+    SPI_FLASH.ctrl.val = state->spi_ctrl_reg;
+    SPI_FLASH.clock.val = state->spi_clk_reg;
+    SPI_FLASH.user.val = state->spi_user_reg;
+
+    Cache_Read_Enable_2();
+    vPortExitCritical();
+}
+
+static void spi_trans_block(bool write_mode,
+                            uint32_t cmd,
+                            uint32_t cmd_bits,
+                            uint32_t addr,
+                            uint32_t addr_bits,
+                            uint8_t *data,
+                            uint32_t data_bytes,
+                            uint32_t dummy_bits)
+{
+    if ((uint32_t)data & 0x3) {
+        ROM_PRINTF("ERROR: data=%p\n", data);
+        return;
+    }
+
+    if (cmd_bits) {
+        SPI_FLASH.user.usr_command = 1;
+        SPI_FLASH.user2.usr_command_value = cmd;
+        SPI_FLASH.user2.usr_command_bitlen = cmd_bits - 1;
+    } else {
+        SPI_FLASH.user.usr_command = 0;
+    }
+
+    if (addr_bits) {
+        SPI_FLASH.user.usr_addr = 1;
+        SPI_FLASH.addr = addr << ADDR_SHIFT_BITS;
+        SPI_FLASH.user1.usr_addr_bitlen = addr_bits - 1;
+    } else {
+        SPI_FLASH.user.usr_addr = 0;
+    }
+
+    if (dummy_bits) {
+        SPI_FLASH.user.usr_dummy = 1;
+        SPI_FLASH.user1.usr_dummy_cyclelen = dummy_bits - 1;
+    } else {
+        SPI_FLASH.user.usr_dummy = 0;
+    }
+
+    if (write_mode && data_bytes) {
+        int words = (data_bytes + 3) / 4;
+        uint32_t *p = (uint32_t *)data;
+
+        SPI_FLASH.user.usr_mosi = 1;
+        SPI_FLASH.user.usr_miso = 0;
+        SPI_FLASH.user1.usr_mosi_bitlen = data_bytes * 8 - 1;
+
+        for (int i = 0; i < words; i++) {
+            SPI_FLASH.data_buf[i] = p[i];
+        }
+    } else if (!write_mode && data_bytes) {
+        int words = (data_bytes + 3) / 4;
+
+        SPI_FLASH.user.usr_mosi = 0;
+        SPI_FLASH.user.usr_miso = 1;
+        SPI_FLASH.user1.usr_miso_bitlen = data_bytes * 8 - 1;
+
+        for (int i = 0; i < words; i++) {
+            SPI_FLASH.data_buf[i] = 0;
+        }
+    } else {
+        SPI_FLASH.user.usr_mosi = 0;
+        SPI_FLASH.user.usr_miso = 0;
+    }
+
+    SPI_FLASH.cmd.usr = 1;
+    while (SPI_FLASH.cmd.usr) {
+        ;
+    }
+
+    if (!write_mode && data_bytes) {
+        int words = (data_bytes + 3) / 4;
+        uint32_t *p = (uint32_t *)data;
+
+        for (int i = 0; i < words; i++) {
+            p[i] = SPI_FLASH.data_buf[i];
+        }
+    }
+}
+
+static void spi_trans(bool write_mode,
+                      uint32_t cmd,
+                      uint32_t cmd_bits,
+                      uint32_t addr,
+                      uint32_t addr_bits,
+                      uint8_t *data,
+                      uint32_t data_bytes,
+                      uint32_t dummy_bits)
+
+{
+    if (!data_bytes || data_bytes <= SPI_BLOCK_SIZE) {
+        return spi_trans_block(write_mode, cmd, cmd_bits, addr,
+                               addr_bits, data, data_bytes, dummy_bits);
+    }
+
+    for (int i = 0; i < data_bytes; i += SPI_BLOCK_SIZE) {
+        uint32_t n = MIN(SPI_BLOCK_SIZE, data_bytes - i);
+
+        spi_trans_block(write_mode, cmd, cmd_bits, addr + i,
+                        addr_bits, data + i, n, dummy_bits);
+    }
+}
+
+static void write_cmd(uint32_t cmd)
+{
+    spi_trans(1, cmd, 8, 0, 0, NULL, 0, 0);
+}
+
+static void write_buffer(uint32_t addr, uint8_t *buffer, int size)
+{
+    for (int i = 0; i < size; i += SPI_BLOCK_SIZE) {
+        int n = MIN(size - i, SPI_BLOCK_SIZE);
+
+        write_cmd(0x6);
+        spi_trans(1, 0x42, 8, addr + i, 24, buffer + i, n, 0);
+        delay(3);
+    }
+}
+
+static void read_buffer(uint32_t addr, uint8_t *buffer, int n)
+{
+    spi_trans(0, 0x48, 8, addr, 24, buffer, n, 8);
+}
+
+static void erase_sector(uint32_t addr)
+{
+    write_cmd(0x6);
+    spi_trans(1, 0x44, 8, addr, 24, NULL, 0, 0);
+    delay(8);
+}
+
+int th25q16hb_apply_patch_0(void)
+{
+    int ret = 0;
+    uint32_t flash_id;
+    int count;
+    spi_state_t state;
+    uint8_t *buffer256_0;
+    uint8_t *buffer256_1;
+    uint8_t *buffer256_2;
+    uint8_t *buffer1024;
+
+    flash_id = spi_flash_get_id();
+    if (flash_id != 0x1560eb) {
+        ROM_PRINTF("WARN: id=0x%x, is not TH25Q16HB\n", flash_id);
+        return 0;
+    }
+
+    buffer1024 = heap_caps_malloc(1024, MALLOC_CAP_8BIT);
+    if (!buffer1024) {
+        return -ENOMEM;
+    }
+
+    buffer256_0 = buffer1024;
+    buffer256_1 = buffer1024 + 256;
+    buffer256_2 = buffer1024 + 512;
+
+    spi_enter(&state);
+
+    // Step 1
+    PRINT_STEP(1);
+    write_cmd(0x33);
+
+    // Step 2
+    PRINT_STEP(2);
+    write_cmd(0xcc);
+    
+    // Step 3
+    PRINT_STEP(3);
+    write_cmd(0xaa);
+
+    // Step 4
+    PRINT_STEP(4);
+    write_u8(0xfa, 0x1200d, 0x3);
+    write_u8_dummy(0xfa, 0x2200d, 0x3, 1);
+
+    // Step 5-1
+    PRINT_STEP(5);
+    read_buffer(0xbed, buffer256_0, 3);
+    if (buffer256_0[0] == 0xff &&
+        buffer256_0[1] == 0xff &&
+        buffer256_0[2] == 0xff) {
+        ROM_PRINTF("INFO: check done 0\n");
+    } else if (buffer256_0[0] == 0x55 &&
+               buffer256_0[1] == 0xff &&
+               buffer256_0[2] == 0xff) {
+        JUMP_TO_STEP(step10);
+    } else if (buffer256_0[0] == 0x55 &&
+               buffer256_0[1] == 0x55 &&
+               buffer256_0[2] == 0xff) {
+        JUMP_TO_STEP(step14);
+    } else if (buffer256_0[0] == 0x55 &&
+               buffer256_0[1] == 0x55 &&
+               buffer256_0[2] == 0x55) {
+        JUMP_TO_STEP(step17);
+    } else {
+        ROM_PRINTF("ERROR: 0xbed=0x%x 0xbee=0x%x 0xbef=0x%x\n",
+                    buffer256_0[0], buffer256_0[1], buffer256_0[2]);
+        GOTO_FAILED(5-1);
+    }
+
+    // Step 5-2
+    read_buffer(0x50d, buffer256_0, 1);
+    buffer256_0[0] &= 0x7f;
+    if (buffer256_0[0] == 0x7c) {
+        JUMP_TO_STEP(step17);
+    } else if (buffer256_0[0] == 0x3c) {
+        ROM_PRINTF("INFO: check done 1\n");
+    } else {
+        ROM_PRINTF("ERROR: 0x50d=0x%x\n", buffer256_0[0]);
+        GOTO_FAILED(5-2);
+    }
+
+    // Step 6
+    PRINT_STEP(6);
+    for (count = 0; count < 3; count++) {
+        erase_sector(0);
+
+        bool check_done = true;
+        read_buffer(0x0, buffer1024, 1024);
+        for (int i = 0; i < 1024; i++) {
+            if (buffer1024[i] != 0xff) {
+                check_done = false;
+                ROM_PRINTF("ERROR: buffer1024[%d]=0x%x\n", i, buffer1024[i]);
+                break;
+            }
+        }
+
+        if (check_done) {
+            break;
+        }
+    }
+    if (count >= 3) {
+        GOTO_FAILED(6)
+    }
+
+    // Step 7-1.1
+    PRINT_STEP(7);
+    read_buffer(0x400, buffer256_0, 256);
+    read_buffer(0x400, buffer256_1, 256);
+    read_buffer(0x400, buffer256_2, 256);
+    if (memcmp(buffer256_0, buffer256_1, 256) ||
+        memcmp(buffer256_0, buffer256_2, 256)) {
+        GOTO_FAILED(7-1.1);
+    }
+
+    write_buffer(0, buffer256_0, 256);
+    write_buffer(0x200, buffer256_0, 256);
+
+    // Step 7-1.2
+    for (count = 0; count < 3; count++) {
+        read_buffer(0, buffer256_1, 256);
+        if (memcmp(buffer256_0, buffer256_1, 256)) {
+            break;
+        }
+
+        read_buffer(0x200, buffer256_1, 256);
+        if (memcmp(buffer256_0, buffer256_1, 256)) {
+            break;
+        }
+    }
+    if (count < 3) {
+        GOTO_FAILED(7-1.2);
+    }
+
+    // Step 7-2.1
+    read_buffer(0x500, buffer256_0, 256);
+    read_buffer(0x500, buffer256_1, 256);
+    read_buffer(0x500, buffer256_2, 256);
+    if (memcmp(buffer256_0, buffer256_1, 256) ||
+        memcmp(buffer256_0, buffer256_2, 256)) {
+        GOTO_FAILED(7-2.1);
+    }
+    write_buffer(0x100, buffer256_0, 256);
+    write_buffer(0x300, buffer256_0, 256);
+
+    // Step 7-2.2
+    for (count = 0; count < 3; count++) {
+        read_buffer(0x100, buffer256_1, 256);
+        if (memcmp(buffer256_0, buffer256_1, 256)) {
+            break;
+        }
+        read_buffer(0x300, buffer256_1, 256);
+        if (memcmp(buffer256_0, buffer256_1, 256)) {
+            break;
+        }
+    }
+    if (count < 3) {
+        GOTO_FAILED(7-2.2);
+    }
+
+    // Step 8
+    PRINT_STEP(8);
+    read_buffer(0x0, buffer256_0, 1);
+    read_buffer(0x23, buffer256_1, 1);
+    if (buffer256_0[0] != 0x13 || buffer256_1[0] != 0x14) {
+        ROM_PRINTF("ERROR: 0x0=0x%x 0x23=0x%x\n", buffer256_0[0], buffer256_1[0]);
+        GOTO_FAILED(8);
+    }
+
+    // Step 9-1
+    PRINT_STEP(9);
+    read_buffer(0x140, buffer256_0, 2);
+    if (buffer256_0[0] != 0 || buffer256_0[1] != 0xff) {
+        ROM_PRINTF("ERROR: 0x140=0x%x 0x141=0x%x\n", buffer256_0[0], buffer256_0[1]);
+        GOTO_FAILED(9-1);
+    }
+
+    // Step 9-2
+    buffer256_0[0] = 0x55;
+    write_buffer(0xaed, buffer256_0, 1);
+    write_buffer(0xbed, buffer256_0, 1);
+    for (count = 0; count < 3; count++) {
+        read_buffer(0xaed, buffer256_0, 1);
+        if (buffer256_0[0] != 0x55) {
+            break;
+        }
+
+        read_buffer(0xbed, buffer256_0, 1);
+        if (buffer256_0[0] != 0x55) {
+            break;
+        }
+    }
+    if (count < 3) {
+        GOTO_FAILED(9-2);
+    }
+
+step10:
+    // Step 10-1
+    PRINT_STEP(10);
+    for (count = 0; count < 3; count++) {
+        erase_sector(0x400);
+
+        bool check_done = true;
+        read_buffer(0x400, buffer1024, 1024);
+        for (int i = 0; i < 1024; i++) {
+            if (buffer1024[i] != 0xff) {
+                check_done = false;
+                ROM_PRINTF("ERROR: buffer1024[%d]=0x%x\n", i, buffer1024[i]);
+                break;
+            }
+        }
+
+        if (check_done) {
+            break;
+        }
+    }
+    if (count >= 3) {
+        GOTO_FAILED(10-1);
+    }
+
+    // Step 10-3.1
+    read_buffer(0, buffer256_0, 256);
+    read_buffer(0, buffer256_1, 256);
+    read_buffer(0, buffer256_2, 256);
+    if (memcmp(buffer256_0, buffer256_1, 256) ||
+        memcmp(buffer256_0, buffer256_2, 256)) {
+        GOTO_FAILED(10-3.1);
+    }
+    write_buffer(0x400, buffer256_0, 256);
+    write_buffer(0x600, buffer256_0, 256);
+
+    // Step 10-3.2
+    for (count = 0; count < 3; count++) {
+        read_buffer(0x400, buffer256_1, 256);
+        if (memcmp(buffer256_0, buffer256_1, 256)) {
+            break;
+        }
+
+        read_buffer(0x600, buffer256_1, 256);
+        if (memcmp(buffer256_0, buffer256_1, 256)) {
+            break;
+        }
+    }
+    if (count < 3) {
+        GOTO_FAILED(10-3.2);
+    }    
+
+    // Step 10-3.3
+    read_buffer(0x100, buffer256_0, 256);
+    read_buffer(0x100, buffer256_1, 256);
+    read_buffer(0x100, buffer256_2, 256);
+    if (memcmp(buffer256_0, buffer256_1, 256) ||
+        memcmp(buffer256_0, buffer256_2, 256)) {
+        GOTO_FAILED(10-3.3);
+    }
+    buffer256_0[9] = 0x79;
+    buffer256_0[13] = (buffer256_0[13] & 0x3f) |
+                       ((~buffer256_0[13]) & 0x80) |
+                       0x40;
+    write_buffer(0x500, buffer256_0, 256);
+    write_buffer(0x700, buffer256_0, 256);
+
+    // Step 10-3.4
+    for (count = 0; count < 3; count++) {
+        read_buffer(0x500, buffer256_1, 256);
+        if (memcmp(buffer256_0, buffer256_1, 256)) {
+            break;
+        }
+
+        read_buffer(0x700, buffer256_1, 256);
+        if (memcmp(buffer256_0, buffer256_1, 256)) {
+            break;
+        }
+    }
+    if (count < 3) {
+        GOTO_FAILED(10-3.4);
+    } 
+
+    // Step11-1
+    PRINT_STEP(11);
+
+    for (count = 0; count < 3; count++) {
+        read_buffer(0x400, buffer256_0, 1);
+        read_buffer(0x423, buffer256_1, 1);
+        if (buffer256_0[0] != 0x13 || buffer256_1[0] != 0x14) {
+            ROM_PRINTF("ERROR: 0x400=0x%x 0x423=0x%x\n", buffer256_0[0], buffer256_1[0]);
+            break;
+        }
+    }
+    if (count < 3) {
+        GOTO_FAILED(11-1);
+    }
+
+    // Step11-2.1
+    for (count = 0; count < 3; count++) {
+        read_buffer(0x540, buffer256_0, 2);
+        if (buffer256_0[0] != 0 || buffer256_0[1] != 0xff) {
+            ROM_PRINTF("ERROR: 0x540=0x%x 0x541=0x%x\n", buffer256_0[0], buffer256_0[1]);
+            break;
+        }
+    }
+    if (count < 3) {
+        GOTO_FAILED(11-2);
+    }
+
+    // Step11-2.2
+    for (count = 0; count < 3; count++) {
+        read_buffer(0x50d, buffer256_0, 1);
+        buffer256_0[0] &= 0x7f;
+        if (buffer256_0[0] != 0x7c) {
+            ROM_PRINTF("ERROR: 0x50d=0x%x\n", buffer256_0[0]);
+            break;
+        }
+    }
+    if (count < 3) {
+        GOTO_FAILED(11-2);
+    }
+
+    // Step 12
+    PRINT_STEP(12);
+    buffer256_0[0] = 0x55;
+    write_buffer(0xaee, buffer256_0, 1);
+    write_buffer(0xbee, buffer256_0, 1);
+
+    // Step 13
+    PRINT_STEP(13);
+    for (count = 0; count < 3; count++) {
+        read_buffer(0xaee, buffer256_0, 1);
+        if (buffer256_0[0] != 0x55) {
+            break;
+        }
+
+        read_buffer(0xbee, buffer256_0, 1);
+        if (buffer256_0[0] != 0x55) {
+            break;
+        }
+    }
+    if (count < 3) {
+        GOTO_FAILED(13);
+    }
+
+step14:
+    // Step 14
+    PRINT_STEP(14);
+    for (count = 0; count < 3; count++) {
+        erase_sector(0);
+
+        bool check_done = true;
+        read_buffer(0x0, buffer1024, 1024);
+        for (int i = 0; i < 1024; i++) {
+            if (buffer1024[i] != 0xff) {
+                check_done = false;
+                ROM_PRINTF("ERROR: buffer1024[%d]=0x%x\n", i, buffer1024[i]);
+                break;
+            }
+        }
+
+        if (check_done) {
+            break;
+        }
+    }
+    if (count >= 3) {
+        GOTO_FAILED(14);
+    }    
+
+    // Step 15
+    PRINT_STEP(15);
+    buffer256_0[0] = 0x55;
+    write_buffer(0xaef, buffer256_0, 1);
+    write_buffer(0xbef, buffer256_0, 1);
+
+    // Step 16
+    PRINT_STEP(16);
+    for (count = 0; count < 3; count++) {
+        read_buffer(0xaef, buffer256_0, 1);
+        if (buffer256_0[0] != 0x55) {
+            break;
+        }
+
+        read_buffer(0xbef, buffer256_0, 1);
+        if (buffer256_0[0] != 0x55) {
+            break;
+        }
+    }
+    if (count < 3) {
+        GOTO_FAILED(16);
+    }
+
+step17:
+    // Step 17
+    PRINT_STEP(17);
+    write_cmd(0x55);
+
+    // Step 18
+    PRINT_STEP(18);
+    write_cmd(0x88);
+
+    spi_exit(&state);
+
+    heap_caps_free(buffer1024);
+
+    if (!ret) {
+        ROM_PRINTF("INFO: Patch for TH25Q16HB is done\n");
+    }
+
+    return ret;
+}
diff --git a/components/spi_flash/src/spi_flash.c b/components/spi_flash/src/spi_flash.c
index 93240e9d2..221b25951 100644
--- a/components/spi_flash/src/spi_flash.c
+++ b/components/spi_flash/src/spi_flash.c
@@ -259,6 +259,12 @@ bool spi_flash_check_wr_protect(void)
                 special_flash_write_status(0x01, status&(~(SPI_GD25Q32_FLASH_WRITE_PROTECT_STATUS)), 1, true);
             }
         }
+    } else if (flash_id == 0x164068) {
+        if(spi_flash_read_status(&status)==0) { //Read status Ok
+            if(status&SPI_GD25Q32_FLASH_WRITE_PROTECT_STATUS) {
+                special_flash_write_status(0x01, status&(~(SPI_GD25Q32_FLASH_WRITE_PROTECT_STATUS)), 1, true);
+            }
+        }       
     }
     //Others
     else {
@@ -435,6 +441,10 @@ void user_spi_flash_dio_to_qio_pre_init(void)
             to_qio = true;
         }
         //ENBALE FLASH QIO 0X01H+0X00+0X02
+    } else if (flash_id == 0x164068) {
+        if (flash_gd25q32c_enable_QIO_mode() == true) {
+            to_qio = true;
+        }  
     } else {
         if (spi_flash_enable_qmode_raw(&g_rom_flashchip) == ESP_OK) {
             to_qio = true;
diff --git a/components/spi_flash/src/spi_flash_raw.c b/components/spi_flash/src/spi_flash_raw.c
index dee89962b..10abf29e0 100644
--- a/components/spi_flash/src/spi_flash_raw.c
+++ b/components/spi_flash/src/spi_flash_raw.c
@@ -39,7 +39,9 @@ uint32_t spi_flash_get_id_raw(esp_rom_spiflash_chip_t *chip)
 {
     uint32_t rdid = 0;
 
+#ifndef BOOTLOADER_BUILD
     Cache_Read_Disable();
+#endif
 
     Wait_SPI_Idle(chip);
 
@@ -49,7 +51,9 @@ uint32_t spi_flash_get_id_raw(esp_rom_spiflash_chip_t *chip)
 
     rdid = READ_PERI_REG(PERIPHS_SPI_FLASH_C0)&0xffffff;
 
+#ifndef BOOTLOADER_BUILD
     Cache_Read_Enable_New();
+#endif
 
     return rdid;
 }
@@ -150,8 +154,11 @@ bool spi_user_cmd_raw(esp_rom_spiflash_chip_t *chip, spi_cmd_dir_t mode, spi_cmd
 {
     int idx = 0;
 
+#ifndef BOOTLOADER_BUILD
     // Cache Disable
     Cache_Read_Disable_2();
+#endif
+
     //wait spi idle
     if((mode & SPI_RAW) == 0) {
         Wait_SPI_Idle(chip);
@@ -272,8 +279,11 @@ bool spi_user_cmd_raw(esp_rom_spiflash_chip_t *chip, spi_cmd_dir_t mode, spi_cmd
     if((mode & SPI_RAW) == 0) {
         Wait_SPI_Idle(chip);
     }
+
+#ifndef BOOTLOADER_BUILD
     //enable icache
     Cache_Read_Enable_2();
+#endif
 
     return true;
 }
diff --git a/components/tcpip_adapter/tcpip_adapter_lwip.c b/components/tcpip_adapter/tcpip_adapter_lwip.c
index bf3f8bad9..3faabd07e 100644
--- a/components/tcpip_adapter/tcpip_adapter_lwip.c
+++ b/components/tcpip_adapter/tcpip_adapter_lwip.c
@@ -825,8 +825,14 @@ esp_err_t tcpip_adapter_set_dns_info(tcpip_adapter_if_t tcpip_if, tcpip_adapter_
         return ESP_ERR_TCPIP_ADAPTER_INVALID_PARAMS;
     }
 
+#if CONFIG_LWIP_IPV6
+    if (!IP_IS_V4(&dns->ip) && !IP_IS_V6(&dns->ip)) {
+        IP_SET_TYPE_VAL(dns->ip, IPADDR_TYPE_V4);
+    }
+#else
     ESP_LOGD(TAG, "set dns if=%d type=%d dns=%x", tcpip_if, type, ip_2_ip4(&(dns->ip))->addr);
     IP_SET_TYPE_VAL(dns->ip, IPADDR_TYPE_V4);
+#endif
 
     if (tcpip_if == TCPIP_ADAPTER_IF_STA || tcpip_if == TCPIP_ADAPTER_IF_ETH) {
         dns_setserver(type, &(dns->ip));
diff --git a/components/wpa_supplicant/src/eap_peer/eap_peap.c b/components/wpa_supplicant/src/eap_peer/eap_peap.c
index 54e0ac0c6..38890f4bb 100644
--- a/components/wpa_supplicant/src/eap_peer/eap_peap.c
+++ b/components/wpa_supplicant/src/eap_peer/eap_peap.c
@@ -66,6 +66,7 @@ struct eap_peap_data {
 	u8 cmk[20];
 	int soh; /* Whether IF-TNCCS-SOH (Statement of Health; Microsoft NAP)
 		  * is enabled. */
+	enum { NO_AUTH, FOR_INITIAL, ALWAYS } phase2_auth;
 };
 
 
@@ -114,6 +115,19 @@ eap_peap_parse_phase1(struct eap_peap_data *data,
 		wpa_printf(MSG_DEBUG, "EAP-PEAP: Require cryptobinding");
 	}
 
+	if (os_strstr(phase1, "phase2_auth=0")) {
+		data->phase2_auth = NO_AUTH;
+		wpa_printf(MSG_DEBUG,
+			   "EAP-PEAP: Do not require Phase 2 authentication");
+	} else if (os_strstr(phase1, "phase2_auth=1")) {
+		data->phase2_auth = FOR_INITIAL;
+		wpa_printf(MSG_DEBUG,
+			   "EAP-PEAP: Require Phase 2 authentication for initial connection");
+	} else if (os_strstr(phase1, "phase2_auth=2")) {
+		data->phase2_auth = ALWAYS;
+		wpa_printf(MSG_DEBUG,
+			   "EAP-PEAP: Require Phase 2 authentication for all cases");
+	}
 #ifdef EAP_TNC
 	if (os_strstr(phase1, "tnc=soh2")) {
 		data->soh = 2;
@@ -145,6 +159,7 @@ eap_peap_init(struct eap_sm *sm)
 	data->force_peap_version = -1;
 	data->peap_outer_success = 2;
 	data->crypto_binding = OPTIONAL_BINDING;
+	data->phase2_auth = FOR_INITIAL;
 
 	if (config && config->phase1 &&
 	    eap_peap_parse_phase1(data, config->phase1) < 0) {
@@ -449,6 +464,18 @@ eap_tlv_validate_cryptobinding(struct eap_sm *sm,
 	return 0;
 }
 
+static bool peap_phase2_sufficient(struct eap_sm *sm,
+				   struct eap_peap_data *data)
+{
+	if ((data->phase2_auth == ALWAYS ||
+	     (data->phase2_auth == FOR_INITIAL &&
+	      !tls_connection_resumed(sm->ssl_ctx, data->ssl.conn) &&
+	      !data->ssl.client_cert_conf) ||
+	     data->phase2_eap_started) &&
+	    !data->phase2_eap_success)
+		return false;
+	return true;
+}
 
 /**
  * eap_tlv_process - Process a received EAP-TLV message and generate a response
@@ -565,6 +592,11 @@ eap_tlv_process(struct eap_sm *sm, struct eap_peap_data *data,
 					   " - force failed Phase 2");
 				resp_status = EAP_TLV_RESULT_FAILURE;
 				ret->decision = DECISION_FAIL;
+			} else if (!peap_phase2_sufficient(sm, data)) {
+				wpa_printf(MSG_INFO,
+					   "EAP-PEAP: Server indicated Phase 2 success, but sufficient Phase 2 authentication has not been completed");
+				resp_status = EAP_TLV_RESULT_FAILURE;
+				ret->decision = DECISION_FAIL;
 			} else {
 				resp_status = EAP_TLV_RESULT_SUCCESS;
 				ret->decision = DECISION_UNCOND_SUCC;
@@ -939,8 +971,7 @@ eap_peap_decrypt(struct eap_sm *sm, struct eap_peap_data *data,
 			/* EAP-Success within TLS tunnel is used to indicate
 			 * shutdown of the TLS channel. The authentication has
 			 * been completed. */
-			if (data->phase2_eap_started &&
-			    !data->phase2_eap_success) {
+			if (!peap_phase2_sufficient(sm, data)) {
 				wpa_printf(MSG_DEBUG, "EAP-PEAP: Phase 2 "
 					   "Success used to indicate success, "
 					   "but Phase 2 EAP was not yet "
@@ -1194,7 +1225,7 @@ eap_peap_has_reauth_data(struct eap_sm *sm, void *priv)
 {
 	struct eap_peap_data *data = priv;
 	return tls_connection_established(sm->ssl_ctx, data->ssl.conn) &&
-		data->phase2_success;
+		data->phase2_success && data->phase2_auth != ALWAYS;
 }
 
 
diff --git a/components/wpa_supplicant/src/eap_peer/eap_tls_common.c b/components/wpa_supplicant/src/eap_peer/eap_tls_common.c
index 9c93f6d0c..31299b7f6 100755
--- a/components/wpa_supplicant/src/eap_peer/eap_tls_common.c
+++ b/components/wpa_supplicant/src/eap_peer/eap_tls_common.c
@@ -84,7 +84,7 @@ static void eap_tls_params_from_conf1(struct tls_connection_params *params,
 static int eap_tls_params_from_conf(struct eap_sm *sm,
 				    struct eap_ssl_data *data,
 				    struct tls_connection_params *params,
-				    struct eap_peer_config *config)
+				    struct eap_peer_config *config, int phase2)
 {
 	os_memset(params, 0, sizeof(*params));
 	if (sm->workaround && data->eap_type != EAP_TYPE_FAST) {
@@ -119,6 +119,12 @@ static int eap_tls_params_from_conf(struct eap_sm *sm,
 		return -1;
 	}
 
+	if (!phase2)
+		data->client_cert_conf = params->client_cert ||
+			params->client_cert_blob ||
+			params->private_key ||
+			params->private_key_blob;
+
 	return 0;
 }
 
@@ -196,7 +202,7 @@ int eap_peer_tls_ssl_init(struct eap_sm *sm, struct eap_ssl_data *data,
 	data->eap = sm;
 	data->eap_type = eap_type;
 	data->ssl_ctx = sm->ssl_ctx;
-	if (eap_tls_params_from_conf(sm, data, &params, config) < 0) /* no phase2 */
+	if (eap_tls_params_from_conf(sm, data, &params, config, data->phase2) < 0) /* no phase2 */
 		return -1;
 
 	if (eap_tls_init_connection(sm, data, config, &params) < 0)
diff --git a/components/wpa_supplicant/src/eap_peer/eap_tls_common.h b/components/wpa_supplicant/src/eap_peer/eap_tls_common.h
index 1a5e0f89e..50390c4ce 100644
--- a/components/wpa_supplicant/src/eap_peer/eap_tls_common.h
+++ b/components/wpa_supplicant/src/eap_peer/eap_tls_common.h
@@ -73,6 +73,11 @@ struct eap_ssl_data {
 	 * eap_type - EAP method used in Phase 1 (EAP_TYPE_TLS/PEAP/TTLS/FAST)
 	 */
 	u8 eap_type;
+
+	/**
+	 * client_cert_conf: Whether client certificate has been configured
+	 */
+	bool client_cert_conf;
 };
 
 
diff --git a/docs/en/api-reference/wifi/esp_wifi.rst b/docs/en/api-reference/wifi/esp_wifi.rst
index d7c24b176..2368cbd26 100644
--- a/docs/en/api-reference/wifi/esp_wifi.rst
+++ b/docs/en/api-reference/wifi/esp_wifi.rst
@@ -10,7 +10,7 @@ The WiFi libraries provide support for configuring and monitoring the ESP8266 Wi
 - AP mode (aka Soft-AP mode or Access Point mode). Stations connect to the ESP8266.
 - Combined AP-STA mode (ESP8266 is concurrently an access point and a station connected to another access point).
 
-- Various security modes for the above (WPA, WPA2, WEP, etc.)
+- Various security modes for the above (WPA, WPA2, WPA3, WEP, etc.)
 - Scanning for access points (active & passive scanning).
 - Promiscuous mode monitoring of IEEE802.11 WiFi packets.
 
diff --git a/docs/requirements.txt b/docs/requirements.txt
index f3884f2ee..a5347f528 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,17 +1,17 @@
 # This is a list of python packages used to generate documentation. This file is used with pip:
 # pip install --user -r requirements.txt
 #
-sphinx>=1.8.4
-breathe==4.11.1
-sphinx-rtd-theme
-sphinx-notfound-page
-sphinxcontrib-blockdiag>=1.5.5, <2.0.0
-sphinxcontrib-seqdiag>=0.8.5, <2.0.0
-sphinxcontrib-actdiag>=0.8.5, <2.0.0
-sphinxcontrib-nwdiag>=0.9.5, <2.0.0
-blockdiag>=1.5.4, <2.0.0
-seqdiag>=0.9.6, <2.0.0
-actdiag>=0.5.4, <2.0.0
-nwdiag>=1.0.4, <2.0.0
-recommonmark
-future>=0.16.0 # for ../tools/gen_esp_err_to_name.py
+setuptools<57.5.0
+sphinx==2.3.1
+breathe==4.14.1
+sphinx-rtd-theme==1.0.0
+sphinx-notfound-page==0.7.1
+sphinxcontrib-blockdiag==2.0.0
+sphinxcontrib-seqdiag==2.0.0
+sphinxcontrib-actdiag==2.0.0
+sphinxcontrib-nwdiag==2.0.0
+sphinxcontrib-wavedrom==2.0.0
+funcparserlib==0.3.6
+nwdiag==2.0.0
+recommonmark==0.7.0
+future==0.16.0 # for ../tools/gen_esp_err_to_name.py
\ No newline at end of file
diff --git a/docs/setuptools.requirements.txt b/docs/setuptools.requirements.txt
new file mode 100644
index 000000000..1f5449f58
--- /dev/null
+++ b/docs/setuptools.requirements.txt
@@ -0,0 +1 @@
+setuptools<57.5.0
\ No newline at end of file
diff --git a/docs/sphinx-known-warnings.txt b/docs/sphinx-known-warnings.txt
index 69b3877a4..8334d71be 100644
--- a/docs/sphinx-known-warnings.txt
+++ b/docs/sphinx-known-warnings.txt
@@ -86,3 +86,7 @@ spi.inc:line: WARNING: Duplicate declaration, uint32_t spi_trans_t::cmd
 spi.inc:line: WARNING: Duplicate declaration, uint32_t spi_trans_t::addr
 spi.inc:line: WARNING: Duplicate declaration, uint32_t spi_trans_t::mosi
 spi.inc:line: WARNING: Duplicate declaration, uint32_t spi_trans_t::miso
+spi.inc:line: WARNING: Duplicate declaration, uint32_t spi_trans_t::cmd :  5
+spi.inc:line: WARNING: Duplicate declaration, uint32_t spi_trans_t::addr :  7
+spi.inc:line: WARNING: Duplicate declaration, uint32_t spi_trans_t::mosi :  10
+spi.inc:line: WARNING: Duplicate declaration, uint32_t spi_trans_t::miso :  10
diff --git a/examples/get-started/hello_world/sdkconfig.ci.2MB b/examples/get-started/hello_world/sdkconfig.ci.2MB
new file mode 100644
index 000000000..b6c645057
--- /dev/null
+++ b/examples/get-started/hello_world/sdkconfig.ci.2MB
@@ -0,0 +1 @@
+CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y
diff --git a/examples/get-started/hello_world/sdkconfig.ci.4MB b/examples/get-started/hello_world/sdkconfig.ci.4MB
new file mode 100644
index 000000000..df4c6ef13
--- /dev/null
+++ b/examples/get-started/hello_world/sdkconfig.ci.4MB
@@ -0,0 +1 @@
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
diff --git a/examples/protocols/sockets/README.md b/examples/protocols/sockets/README.md
index 9fbc850db..1679cb584 100644
--- a/examples/protocols/sockets/README.md
+++ b/examples/protocols/sockets/README.md
@@ -1,7 +1,7 @@
 
 # BSD Socket API Examples
 
-This directory contains simple examples demonstrating BSD Socket API. 
+This directory contains simple examples demonstrating BSD Socket API.
 Each example, contains README.md file with mode detailed informations about that particular example.
 For more general informations about all examples, see the README.md file in the upper level 'examples' directory.
 Examples:
@@ -26,8 +26,8 @@ http://wiki.treck.com/Introduction_to_BSD_Sockets
 
 ## Host tools
 
-There are many host-side tools which can be used to interact with the UDP/TCP server/client example. 
-One command line tool is [netcat](http://netcat.sourceforge.net) which can send and receive many kinds of packets. 
+There are many host-side tools which can be used to interact with the UDP/TCP server/client example.
+One command line tool is [netcat](http://netcat.sourceforge.net) which can send and receive many kinds of packets.
 Note: please replace `192.168.0.167 3333` with desired IPV4/IPV6 address (displayed in monitor console) and port number in the following commands.
 
 In addition to those tools, simple Python scripts can be found under sockets/scripts directory. Every script is designed to interact with one of the examples.
@@ -74,7 +74,7 @@ IPV6 = 'FE80::32AE:A4FF:FE80:5288'
 
 ## Hardware Required
 
-This example can be run on any commonly available ESP32 development board.
+This example can be run on any commonly available ESP8266 development board.
 
 ## Configure the project
 
@@ -97,6 +97,3 @@ make -j4 flash monitor
 (To exit the serial monitor, type ``Ctrl-]``.)
 
 See the Getting Started Guide for full steps to configure and use ESP-IDF to build projects.
-
-
-
diff --git a/examples/protocols/sockets/tcp_client/README.md b/examples/protocols/sockets/tcp_client/README.md
index be9e9f2d4..a927f7a78 100644
--- a/examples/protocols/sockets/tcp_client/README.md
+++ b/examples/protocols/sockets/tcp_client/README.md
@@ -9,8 +9,8 @@ The application creates a TCP socket and tries to connect to the server with pre
 
 In order to create TCP server that communicates with TCP Client example, choose one of the following options.
 
-There are many host-side tools which can be used to interact with the UDP/TCP server/client. 
-One command line tool is [netcat](http://netcat.sourceforge.net) which can send and receive many kinds of packets. 
+There are many host-side tools which can be used to interact with the UDP/TCP server/client.
+One command line tool is [netcat](http://netcat.sourceforge.net) which can send and receive many kinds of packets.
 Note: please replace `192.168.0.167 3333` with desired IPV4/IPV6 address (displayed in monitor console) and port number in the following command.
 
 In addition to those tools, simple Python scripts can be found under sockets/scripts directory. Every script is designed to interact with one of the examples.
@@ -30,7 +30,7 @@ PORT = 3333;
 
 ## Hardware Required
 
-This example can be run on any commonly available ESP32 development board.
+This example can be run on any commonly available ESP8266 development board.
 
 ## Configure the project
 
diff --git a/examples/protocols/sockets/tcp_server/README.md b/examples/protocols/sockets/tcp_server/README.md
index f43dc0791..828bf8e56 100644
--- a/examples/protocols/sockets/tcp_server/README.md
+++ b/examples/protocols/sockets/tcp_server/README.md
@@ -9,8 +9,8 @@ The application creates a TCP socket with the specified port number and waits fo
 
 In order to create TCP client that communicates with TCP server example, choose one of the following options.
 
-There are many host-side tools which can be used to interact with the UDP/TCP server/client. 
-One command line tool is [netcat](http://netcat.sourceforge.net) which can send and receive many kinds of packets. 
+There are many host-side tools which can be used to interact with the UDP/TCP server/client.
+One command line tool is [netcat](http://netcat.sourceforge.net) which can send and receive many kinds of packets.
 Note: please replace `192.168.0.167 3333` with desired IPV4/IPV6 address (displayed in monitor console) and port number in the following command.
 
 In addition to those tools, simple Python scripts can be found under sockets/scripts directory. Every script is designed to interact with one of the examples.
@@ -32,7 +32,7 @@ IPV6 = 'FE80::32AE:A4FF:FE80:5288'
 
 ## Hardware Required
 
-This example can be run on any commonly available ESP32 development board.
+This example can be run on any commonly available ESP8266 development board.
 
 ## Configure the project
 
diff --git a/examples/protocols/sockets/udp_client/README.md b/examples/protocols/sockets/udp_client/README.md
index 80994e2c0..01b10b9de 100644
--- a/examples/protocols/sockets/udp_client/README.md
+++ b/examples/protocols/sockets/udp_client/README.md
@@ -9,8 +9,8 @@ The application creates UDP socket and sends message to the predefined port and
 
 In order to create UDP server that communicates with UDP Client example, choose one of the following options.
 
-There are many host-side tools which can be used to interact with the UDP/TCP server/client. 
-One command line tool is [netcat](http://netcat.sourceforge.net) which can send and receive many kinds of packets. 
+There are many host-side tools which can be used to interact with the UDP/TCP server/client.
+One command line tool is [netcat](http://netcat.sourceforge.net) which can send and receive many kinds of packets.
 Note: please replace `192.168.0.167 3333` with desired IPV4/IPV6 address (displayed in monitor console) and port number in the following commands.
 
 In addition to those tools, simple Python scripts can be found under sockets/scripts directory. Every script is designed to interact with one of the examples.
@@ -40,7 +40,7 @@ PORT = 3333;
 
 ## Hardware Required
 
-This example can be run on any commonly available ESP32 development board.
+This example can be run on any commonly available ESP8266 development board.
 
 ## Configure the project
 
diff --git a/examples/protocols/sockets/udp_server/README.md b/examples/protocols/sockets/udp_server/README.md
index 8fe64a73e..a3e17de49 100644
--- a/examples/protocols/sockets/udp_server/README.md
+++ b/examples/protocols/sockets/udp_server/README.md
@@ -9,8 +9,8 @@ The application creates UDP socket with the specified port number and waits for
 
 In order to create UDP client that communicates with UDP server example, choose one of the following options.
 
-There are many host-side tools which can be used to interact with the UDP/TCP server/client. 
-One command line tool is [netcat](http://netcat.sourceforge.net) which can send and receive many kinds of packets. 
+There are many host-side tools which can be used to interact with the UDP/TCP server/client.
+One command line tool is [netcat](http://netcat.sourceforge.net) which can send and receive many kinds of packets.
 Note: please replace `192.168.0.167 3333` with desired IPV4/IPV6 address (displayed in monitor console) and port number in the following commands.
 
 In addition to those tools, simple Python scripts can be found under sockets/scripts directory. Every script is designed to interact with one of the examples.
@@ -42,7 +42,7 @@ IPV6 = 'FE80::32AE:A4FF:FE80:5288'
 
 ## Hardware Required
 
-This example can be run on any commonly available ESP32 development board.
+This example can be run on any commonly available ESP8266 development board.
 
 ## Configure the project
 
diff --git a/examples/provisioning/legacy/custom_config/README.md b/examples/provisioning/legacy/custom_config/README.md
index 0af5006c8..80e0bbf97 100644
--- a/examples/provisioning/legacy/custom_config/README.md
+++ b/examples/provisioning/legacy/custom_config/README.md
@@ -22,7 +22,7 @@ Also, it uses a component provided with this example `custom_provisioning` which
 
 ### Hardware Required
 
-Example should be able to run on any commonly available ESP32 development board.
+Example should be able to run on any commonly available ESP8266 development board.
 
 ### Application Required
 
diff --git a/examples/provisioning/legacy/softap_prov/README.md b/examples/provisioning/legacy/softap_prov/README.md
index c59bc0bd5..c916bfdf2 100644
--- a/examples/provisioning/legacy/softap_prov/README.md
+++ b/examples/provisioning/legacy/softap_prov/README.md
@@ -23,7 +23,7 @@ This example can be used, as it is, for adding a provisioning service to any app
 
 ### Hardware Required
 
-Example should be able to run on any commonly available ESP32 development board.
+Example should be able to run on any commonly available ESP8266 development board.
 
 ### Application Required
 
diff --git a/examples/system/factory-test/components/rf_test/lib/librftest.a b/examples/system/factory-test/components/rf_test/lib/librftest.a
old mode 100755
new mode 100644
index d76a39ea6..fdf36b009
Binary files a/examples/system/factory-test/components/rf_test/lib/librftest.a and b/examples/system/factory-test/components/rf_test/lib/librftest.a differ
diff --git a/requirements.txt b/requirements.txt
index a43c6d4ae..6a9793304 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,6 +8,6 @@ setuptools
 click>=5.0
 pyserial>=3.0
 future>=0.15.2
-cryptography>=2.1.4
+cryptography>=2.1.4,<35
 pyparsing>=2.0.3,<2.4.0
 pyelftools>=0.22
diff --git a/tools/ci/build_examples.sh b/tools/ci/build_examples.sh
index b30f5c51f..fbeaf65ae 100755
--- a/tools/ci/build_examples.sh
+++ b/tools/ci/build_examples.sh
@@ -118,53 +118,75 @@ build_example () {
     local EXAMPLE_DIR=$(dirname "${MAKE_FILE}")
     local EXAMPLE_NAME=$(basename "${EXAMPLE_DIR}")
 
-    local EXAMPLE_BUILD_DIR="${ID}_${EXAMPLE_NAME}"
+    local EXAMPLE_BUILD_DIRS=()
 
-    if [[ -f "example_builds/${EXAMPLE_BUILD_DIR}/build/ci_build_success" ]]; then
-        echo "Project ${EXAMPLE_BUILD_DIR} has been built and skip building ..."
+    # count number of CI sdkconfig files
+    SDKCONFIG_CI_FILES=$( find ${EXAMPLE_DIR}/ -type f -name sdkconfig.ci.* | sort )
+    if [[ -z ${SDKCONFIG_CI_FILES} ]]; then
+        EXAMPLE_BUILD_DIRS[0]="${ID}_${EXAMPLE_NAME}"
     else
-        echo "Building ${EXAMPLE_BUILD_DIR}..."
-        mkdir -p "example_builds/${EXAMPLE_BUILD_DIR}"
-        cp -r "${EXAMPLE_DIR}/"* "example_builds/${EXAMPLE_BUILD_DIR}/"
-        pushd "example_builds/${EXAMPLE_BUILD_DIR}"
-            # be stricter in the CI build than the default IDF settings
-            export EXTRA_CFLAGS="-Werror -Werror=deprecated-declarations"
-            export EXTRA_CXXFLAGS=${EXTRA_CFLAGS}
-
-            # sdkconfig files are normally not checked into git, but may be present when
-            # a developer runs this script locally
-            rm -f sdkconfig
-
-            # If sdkconfig.ci file is present, append it to sdkconfig.defaults,
-            # replacing environment variables
-            if [[ -f "$SDKCONFIG_DEFAULTS_CI" ]]; then
-                cat $SDKCONFIG_DEFAULTS_CI | $IDF_PATH/tools/ci/envsubst.py >> sdkconfig.defaults
-            fi
-
-            # build non-verbose first
-            local BUILDLOG=${LOG_PATH}/ex_${EXAMPLE_BUILD_DIR}_log.txt
-            touch ${BUILDLOG}
-
-            local FLASH_ARGS=build/download.config
-
-            make clean >>${BUILDLOG} 2>&1 &&
-            make defconfig >>${BUILDLOG} 2>&1 &&
-            make all -j4 >>${BUILDLOG} 2>&1 &&
-            make ota >>${BUILDLOG} 2>&1 &&
-            make print_flash_cmd >${FLASH_ARGS}.full 2>>${BUILDLOG} &&
-            touch build/ci_build_success ||
-            {
-                RESULT=$?; FAILED_EXAMPLES+=" ${EXAMPLE_NAME}" ;
-            }
-
-            tail -n 1 ${FLASH_ARGS}.full > ${FLASH_ARGS} || :
-            test -s ${FLASH_ARGS} || die "Error: ${FLASH_ARGS} file is empty"
-
-            cat ${BUILDLOG}
-        popd
-
-        grep -i "error\|warning" "${BUILDLOG}" 2>&1 >> "${LOG_SUSPECTED}" || :
+        COUNT=0
+        for CI_FILE in ${SDKCONFIG_CI_FILES}
+        do
+            EXAMPLE_BUILD_DIRS[COUNT]="${ID}_${EXAMPLE_NAME}_${CI_FILE##*.}"
+            COUNT=$(( $COUNT + 1 ))
+        done
     fi
+    
+    for EXAMPLE_BUILD_DIR in ${EXAMPLE_BUILD_DIRS[*]}
+    do
+        if [[ -f "example_builds/${EXAMPLE_BUILD_DIR}/build/ci_build_success" ]]; then
+            echo "Project ${EXAMPLE_BUILD_DIR} has been built and skip building ..."
+        else
+            echo "Building ${EXAMPLE_BUILD_DIR}..."
+            mkdir -p "example_builds/${EXAMPLE_BUILD_DIR}"
+            cp -r "${EXAMPLE_DIR}/"* "example_builds/${EXAMPLE_BUILD_DIR}/"
+
+            if [[ -n ${SDKCONFIG_CI_FILES} ]]; then
+                cp "example_builds/${EXAMPLE_BUILD_DIR}/sdkconfig.ci.${EXAMPLE_BUILD_DIR##*_}" "example_builds/${EXAMPLE_BUILD_DIR}/sdkconfig.ci"
+                rm example_builds/${EXAMPLE_BUILD_DIR}/sdkconfig.ci.*
+            fi
+        
+            pushd "example_builds/${EXAMPLE_BUILD_DIR}"
+                # be stricter in the CI build than the default IDF settings
+                export EXTRA_CFLAGS="-Werror -Werror=deprecated-declarations"
+                export EXTRA_CXXFLAGS=${EXTRA_CFLAGS}
+
+                # sdkconfig files are normally not checked into git, but may be present when
+                # a developer runs this script locally
+                rm -f sdkconfig
+
+                # If sdkconfig.ci file is present, append it to sdkconfig.defaults,
+                # replacing environment variables
+                if [[ -f "$SDKCONFIG_DEFAULTS_CI" ]]; then
+                    cat $SDKCONFIG_DEFAULTS_CI | $IDF_PATH/tools/ci/envsubst.py >> sdkconfig.defaults
+                fi
+
+                # build non-verbose first
+                local BUILDLOG=${LOG_PATH}/ex_${EXAMPLE_BUILD_DIR}_log.txt
+                touch ${BUILDLOG}
+
+                local FLASH_ARGS=build/download.config
+
+                make clean >>${BUILDLOG} 2>&1 &&
+                make defconfig >>${BUILDLOG} 2>&1 &&
+                make all -j4 >>${BUILDLOG} 2>&1 &&
+                make ota >>${BUILDLOG} 2>&1 &&
+                make print_flash_cmd >${FLASH_ARGS}.full 2>>${BUILDLOG} &&
+                touch build/ci_build_success ||
+                {
+                    RESULT=$?; FAILED_EXAMPLES+=" ${EXAMPLE_NAME}" ;
+                }
+
+                tail -n 1 ${FLASH_ARGS}.full > ${FLASH_ARGS} || :
+                test -s ${FLASH_ARGS} || die "Error: ${FLASH_ARGS} file is empty"
+
+                cat ${BUILDLOG}
+            popd
+
+            grep -i "error\|warning" "${BUILDLOG}" 2>&1 >> "${LOG_SUSPECTED}" || :
+        fi
+    done
 }
 
 EXAMPLE_NUM=0
diff --git a/tools/ci/build_examples_cmake.sh b/tools/ci/build_examples_cmake.sh
index 914dbcc2e..24063bad9 100755
--- a/tools/ci/build_examples_cmake.sh
+++ b/tools/ci/build_examples_cmake.sh
@@ -132,47 +132,70 @@ build_example () {
     local EXAMPLE_DIR=$(dirname "${CMAKELISTS}")
     local EXAMPLE_NAME=$(basename "${EXAMPLE_DIR}")
 
-    local EXAMPLE_BUILD_DIR="${ID}_${EXAMPLE_NAME}"
+    local EXAMPLE_BUILD_DIRS=()
 
-    if [[ -f "example_builds/${EXAMPLE_BUILD_DIR}/build/ci_build_success" ]]; then
-        echo "Project ${EXAMPLE_NAME} has been built and skip building ..."
+    # count number of CI sdkconfig files
+    SDKCONFIG_CI_FILES=$( find ${EXAMPLE_DIR}/ -type f -name sdkconfig.ci.* | sort )
+    if [[ -z ${SDKCONFIG_CI_FILES} ]]; then
+        EXAMPLE_BUILD_DIRS[0]="${ID}_${EXAMPLE_NAME}"
     else
-        echo "Building ${EXAMPLE_BUILD_DIR}..."
-        mkdir -p "example_builds/${EXAMPLE_BUILD_DIR}"
-        cp -r "${EXAMPLE_DIR}/"* "example_builds/${EXAMPLE_BUILD_DIR}"
-        pushd "example_builds/${EXAMPLE_BUILD_DIR}"
-            # be stricter in the CI build than the default IDF settings
-            export EXTRA_CFLAGS="-Werror -Werror=deprecated-declarations"
-            export EXTRA_CXXFLAGS=${EXTRA_CFLAGS}
-
-            prepare_build ${EXAMPLE_NAME}
-
-            # sdkconfig files are normally not checked into git, but may be present when
-            # a developer runs this script locally
-            rm -f sdkconfig
-
-            # If sdkconfig.ci file is present, append it to sdkconfig.defaults,
-            # replacing environment variables
-            if [[ -f "$SDKCONFIG_DEFAULTS_CI" ]]; then
-                cat $SDKCONFIG_DEFAULTS_CI | $IDF_PATH/tools/ci/envsubst.py >> sdkconfig.defaults
-            fi
-
-            # build non-verbose first
-            local BUILDLOG=${LOG_PATH}/ex_${EXAMPLE_BUILD_DIR}_log.txt
-            touch ${BUILDLOG}
-
-            idf.py build >>${BUILDLOG} 2>&1 &&
-            cp build/flash_project_args build/download.config && # backwards compatible download.config filename
-            touch build/ci_build_success ||
-            {
-                RESULT=$?; FAILED_EXAMPLES+=" ${EXAMPLE_NAME}" ;
-            }
-
-            cat ${BUILDLOG}
-        popd
-
-        grep -i "error\|warning" "${BUILDLOG}" 2>&1 | grep -v "error.c.obj" >> "${LOG_SUSPECTED}" || :
+        COUNT=0
+        for CI_FILE in ${SDKCONFIG_CI_FILES}
+        do
+            echo "${COUNT} ${CI_FILE}"
+            EXAMPLE_BUILD_DIRS[COUNT]="${ID}_${EXAMPLE_NAME}_${CI_FILE##*.}"
+            COUNT=$(( $COUNT + 1 ))
+        done
     fi
+    
+    for EXAMPLE_BUILD_DIR in ${EXAMPLE_BUILD_DIRS[*]}
+    do
+        if [[ -f "example_builds/${EXAMPLE_BUILD_DIR}/build/ci_build_success" ]]; then
+            echo "Project ${EXAMPLE_BUILD_DIR} has been built and skip building ..."
+        else
+            echo "Building ${EXAMPLE_BUILD_DIR}..."
+            mkdir -p "example_builds/${EXAMPLE_BUILD_DIR}"
+            cp -r "${EXAMPLE_DIR}/"* "example_builds/${EXAMPLE_BUILD_DIR}/"
+
+            if [[ -n ${SDKCONFIG_CI_FILES} ]]; then
+                cp "example_builds/${EXAMPLE_BUILD_DIR}/sdkconfig.ci.${EXAMPLE_BUILD_DIR##*_}" "example_builds/${EXAMPLE_BUILD_DIR}/sdkconfig.ci"
+                rm example_builds/${EXAMPLE_BUILD_DIR}/sdkconfig.ci.*
+            fi
+    
+            pushd "example_builds/${EXAMPLE_BUILD_DIR}"
+                # be stricter in the CI build than the default IDF settings
+                export EXTRA_CFLAGS="-Werror -Werror=deprecated-declarations"
+                export EXTRA_CXXFLAGS=${EXTRA_CFLAGS}
+
+                prepare_build ${EXAMPLE_NAME}
+
+                # sdkconfig files are normally not checked into git, but may be present when
+                # a developer runs this script locally
+                rm -f sdkconfig
+
+                # If sdkconfig.ci file is present, append it to sdkconfig.defaults,
+                # replacing environment variables
+                if [[ -f "$SDKCONFIG_DEFAULTS_CI" ]]; then
+                    cat $SDKCONFIG_DEFAULTS_CI | $IDF_PATH/tools/ci/envsubst.py >> sdkconfig.defaults
+                fi
+
+                # build non-verbose first
+                local BUILDLOG=${LOG_PATH}/ex_${EXAMPLE_BUILD_DIR}_log.txt
+                touch ${BUILDLOG}
+
+                idf.py build >>${BUILDLOG} 2>&1 &&
+                cp build/flash_project_args build/download.config && # backwards compatible download.config filename
+                touch build/ci_build_success ||
+                {
+                    RESULT=$?; FAILED_EXAMPLES+=" ${EXAMPLE_NAME}" ;
+                }
+
+                cat ${BUILDLOG}
+            popd
+
+            grep -i "error\|warning" "${BUILDLOG}" 2>&1 | grep -v "error.c.obj" >> "${LOG_SUSPECTED}" || :
+        fi
+    done
 }
 
 EXAMPLE_NUM=0