diff --git a/components/esp_wifi/include/esp_wifi_types.h b/components/esp_wifi/include/esp_wifi_types.h
index b5d9affc5b..62aca03a4e 100644
--- a/components/esp_wifi/include/esp_wifi_types.h
+++ b/components/esp_wifi/include/esp_wifi_types.h
@@ -56,7 +56,7 @@ typedef struct {
 } wifi_country_t;
 
 /* Strength of authmodes */
-/* OPEN < WEP < WPA_PSK < OWE < WPA2_PSK = WPA_WPA2_PSK < WAPI_PSK < WPA3_PSK = WPA2_WPA3_PSK < WPA3_EXT_PSK */
+/* OPEN < WEP < WPA_PSK < OWE < WPA2_PSK = WPA_WPA2_PSK < WAPI_PSK < WPA3_PSK = WPA2_WPA3_PSK < WPA3_EXT_PSK = WPA3_EXT_PSK_MIXED_MODE */
 typedef enum {
     WIFI_AUTH_OPEN = 0,         /**< authenticate mode : open */
     WIFI_AUTH_WEP,              /**< authenticate mode : WEP */
@@ -71,6 +71,7 @@ typedef enum {
     WIFI_AUTH_OWE,              /**< authenticate mode : OWE */
     WIFI_AUTH_WPA3_ENT_192,     /**< authenticate mode : WPA3_ENT_SUITE_B_192_BIT */
     WIFI_AUTH_WPA3_EXT_PSK,     /**< authenticate mode : WPA3_PSK_EXT_KEY */
+    WIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE, /**< authenticate mode: WPA3_PSK + WPA3_PSK_EXT_KEY */
     WIFI_AUTH_MAX
 } wifi_auth_mode_t;
 
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index aa0de74487..b4991a9d22 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit aa0de74487b6f753b433e1d6f107fc3b7e505f16
+Subproject commit b4991a9d2216f2cab9d7dfa1ed666be478f1aee0
diff --git a/examples/mesh/internal_communication/sdkconfig.defaults b/examples/mesh/internal_communication/sdkconfig.defaults
new file mode 100644
index 0000000000..4983b4dfe3
--- /dev/null
+++ b/examples/mesh/internal_communication/sdkconfig.defaults
@@ -0,0 +1 @@
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
diff --git a/examples/system/ota/advanced_https_ota/sdkconfig.ci.bluedroid b/examples/system/ota/advanced_https_ota/sdkconfig.ci.bluedroid
index 22530e86cf..66640a60ee 100644
--- a/examples/system/ota/advanced_https_ota/sdkconfig.ci.bluedroid
+++ b/examples/system/ota/advanced_https_ota/sdkconfig.ci.bluedroid
@@ -7,6 +7,7 @@ CONFIG_CTRL_BTDM_MODEM_SLEEP=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_BT_STACK_NO_LOG=y
 
 # Partition Table
 CONFIG_PARTITION_TABLE_CUSTOM=y
diff --git a/examples/wifi/scan/main/scan.c b/examples/wifi/scan/main/scan.c
index 9bd3ab271d..14b6935b5d 100644
--- a/examples/wifi/scan/main/scan.c
+++ b/examples/wifi/scan/main/scan.c
@@ -58,6 +58,9 @@ static void print_auth_mode(int authmode)
     case WIFI_AUTH_WPA3_EXT_PSK:
         ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA3_EXT_PSK");
         break;
+    case WIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE:
+        ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE");
+        break;
     default:
         ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_UNKNOWN");
         break;