diff --git a/.travis.yml b/.travis.yml
index bc61382..ecc86ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: python
 python:
   - "2.7"
-  - "3.5"
+  - "3.6"
 
 env:
   - PLATFORMIO_PROJECT_DIR=examples/arduino-blink
diff --git a/boards/esp32-poe.json b/boards/esp32-poe.json
index c9d1bb1..082e0b3 100644
--- a/boards/esp32-poe.json
+++ b/boards/esp32-poe.json
@@ -19,7 +19,7 @@
     "arduino",
     "espidf"
   ],
-  "name": "me=OLIMEX ESP32-PoE",
+  "name": "OLIMEX ESP32-PoE",
   "upload": {
     "flash_size": "4MB",
     "maximum_ram_size": 327680,
diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py
index 3b325b9..22ea143 100644
--- a/builder/frameworks/espidf.py
+++ b/builder/frameworks/espidf.py
@@ -192,6 +192,7 @@ env.Prepend(
         join(FRAMEWORK_DIR, "components", "aws_iot",
              "aws-iot-device-sdk-embedded-C", "include"),
         join(FRAMEWORK_DIR, "components", "bootloader_support", "include"),
+        join(FRAMEWORK_DIR, "components", "bootloader_support", "include_priv"),
         join(FRAMEWORK_DIR, "components", "bt", "include"),
         join(FRAMEWORK_DIR, "components", "bt", "bluedroid", "api", "include", "api"),
         join(FRAMEWORK_DIR, "components", "coap", "port", "include"),
@@ -422,6 +423,7 @@ ignore_dirs = (
     "aws_iot",
     "espcoredump",
     "bootloader",
+    "bootloader_support",
     "heap",
     "esptool_py",
     "freertos",
@@ -454,6 +456,12 @@ libs.append(env.BuildLibrary(
     src_filter="+<*> -<test> -<sys_view> -<gcov>"
 ))
 
+libs.append(env.BuildLibrary(
+    join("$BUILD_DIR", "bootloader_support"),
+    join(FRAMEWORK_DIR, "components", "bootloader_support"),
+    src_filter="+<*> -<test> -<src/bootloader_init.c>"
+))
+
 libs.append(env.BuildLibrary(
     join("$BUILD_DIR", "soc"),
     join(FRAMEWORK_DIR, "components", "soc"),
diff --git a/builder/main.py b/builder/main.py
index 1e3ea14..d3afded 100644
--- a/builder/main.py
+++ b/builder/main.py
@@ -278,7 +278,7 @@ if upload_protocol == "esptool":
         UPLOADOTACMD='"$PYTHONEXE" "$UPLOADEROTA" $UPLOADEROTAFLAGS -f $SOURCE',
     )
     for image in env.get("FLASH_EXTRA_IMAGES", []):
-        env.Append(UPLOADERFLAGS=[image[0], image[1]])
+        env.Append(UPLOADERFLAGS=[image[0], env.subst(image[1])])
 
     if "uploadfs" in COMMAND_LINE_TARGETS:
         env.Replace(
diff --git a/examples/espidf-aws-iot/src/sdkconfig.h b/examples/espidf-aws-iot/src/sdkconfig.h
index 2bfd734..788dcb4 100644
--- a/examples/espidf-aws-iot/src/sdkconfig.h
+++ b/examples/espidf-aws-iot/src/sdkconfig.h
@@ -1,6 +1,5 @@
 /*
  *
- * Automatically generated file; DO NOT EDIT.
  * Espressif IoT Development Framework Configuration
  *
  */
@@ -30,6 +29,7 @@
 #define CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE 0
 #define CONFIG_MBEDTLS_AES_C 1
 #define CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED 1
+#define CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN 752
 #define CONFIG_MBEDTLS_GCM_C 1
 #define CONFIG_ESPTOOLPY_FLASHSIZE "2MB"
 #define CONFIG_HEAP_POISONING_DISABLED 1
@@ -39,6 +39,7 @@
 #define CONFIG_SPIFFS_CACHE 1
 #define CONFIG_INT_WDT 1
 #define CONFIG_MBEDTLS_SSL_PROTO_TLS1 1
+#define CONFIG_ESP_GRATUITOUS_ARP 1
 #define CONFIG_AWS_IOT_SHADOW_MAX_SIZE_OF_UNIQUE_CLIENT_ID_BYTES 80
 #define CONFIG_MBEDTLS_ECDSA_C 1
 #define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
@@ -162,6 +163,7 @@
 #define CONFIG_ESPTOOLPY_COMPRESSED 1
 #define CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp.csv"
 #define CONFIG_TCP_SND_BUF_DEFAULT 5744
+#define CONFIG_GARP_TMR_INTERVAL 60
 #define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
 #define CONFIG_BNEP_INITIAL_TRACE_LEVEL 2
 #define CONFIG_HCI_TRACE_LEVEL_WARNING 1
diff --git a/examples/espidf-ble-adv/src/sdkconfig.h b/examples/espidf-ble-adv/src/sdkconfig.h
index 2bfd734..788dcb4 100644
--- a/examples/espidf-ble-adv/src/sdkconfig.h
+++ b/examples/espidf-ble-adv/src/sdkconfig.h
@@ -1,6 +1,5 @@
 /*
  *
- * Automatically generated file; DO NOT EDIT.
  * Espressif IoT Development Framework Configuration
  *
  */
@@ -30,6 +29,7 @@
 #define CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE 0
 #define CONFIG_MBEDTLS_AES_C 1
 #define CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED 1
+#define CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN 752
 #define CONFIG_MBEDTLS_GCM_C 1
 #define CONFIG_ESPTOOLPY_FLASHSIZE "2MB"
 #define CONFIG_HEAP_POISONING_DISABLED 1
@@ -39,6 +39,7 @@
 #define CONFIG_SPIFFS_CACHE 1
 #define CONFIG_INT_WDT 1
 #define CONFIG_MBEDTLS_SSL_PROTO_TLS1 1
+#define CONFIG_ESP_GRATUITOUS_ARP 1
 #define CONFIG_AWS_IOT_SHADOW_MAX_SIZE_OF_UNIQUE_CLIENT_ID_BYTES 80
 #define CONFIG_MBEDTLS_ECDSA_C 1
 #define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
@@ -162,6 +163,7 @@
 #define CONFIG_ESPTOOLPY_COMPRESSED 1
 #define CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp.csv"
 #define CONFIG_TCP_SND_BUF_DEFAULT 5744
+#define CONFIG_GARP_TMR_INTERVAL 60
 #define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
 #define CONFIG_BNEP_INITIAL_TRACE_LEVEL 2
 #define CONFIG_HCI_TRACE_LEVEL_WARNING 1
diff --git a/examples/espidf-blink/src/sdkconfig.h b/examples/espidf-blink/src/sdkconfig.h
index 2bfd734..788dcb4 100644
--- a/examples/espidf-blink/src/sdkconfig.h
+++ b/examples/espidf-blink/src/sdkconfig.h
@@ -1,6 +1,5 @@
 /*
  *
- * Automatically generated file; DO NOT EDIT.
  * Espressif IoT Development Framework Configuration
  *
  */
@@ -30,6 +29,7 @@
 #define CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE 0
 #define CONFIG_MBEDTLS_AES_C 1
 #define CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED 1
+#define CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN 752
 #define CONFIG_MBEDTLS_GCM_C 1
 #define CONFIG_ESPTOOLPY_FLASHSIZE "2MB"
 #define CONFIG_HEAP_POISONING_DISABLED 1
@@ -39,6 +39,7 @@
 #define CONFIG_SPIFFS_CACHE 1
 #define CONFIG_INT_WDT 1
 #define CONFIG_MBEDTLS_SSL_PROTO_TLS1 1
+#define CONFIG_ESP_GRATUITOUS_ARP 1
 #define CONFIG_AWS_IOT_SHADOW_MAX_SIZE_OF_UNIQUE_CLIENT_ID_BYTES 80
 #define CONFIG_MBEDTLS_ECDSA_C 1
 #define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
@@ -162,6 +163,7 @@
 #define CONFIG_ESPTOOLPY_COMPRESSED 1
 #define CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp.csv"
 #define CONFIG_TCP_SND_BUF_DEFAULT 5744
+#define CONFIG_GARP_TMR_INTERVAL 60
 #define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
 #define CONFIG_BNEP_INITIAL_TRACE_LEVEL 2
 #define CONFIG_HCI_TRACE_LEVEL_WARNING 1
diff --git a/examples/espidf-coap-server/src/sdkconfig.h b/examples/espidf-coap-server/src/sdkconfig.h
index 2bfd734..788dcb4 100644
--- a/examples/espidf-coap-server/src/sdkconfig.h
+++ b/examples/espidf-coap-server/src/sdkconfig.h
@@ -1,6 +1,5 @@
 /*
  *
- * Automatically generated file; DO NOT EDIT.
  * Espressif IoT Development Framework Configuration
  *
  */
@@ -30,6 +29,7 @@
 #define CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE 0
 #define CONFIG_MBEDTLS_AES_C 1
 #define CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED 1
+#define CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN 752
 #define CONFIG_MBEDTLS_GCM_C 1
 #define CONFIG_ESPTOOLPY_FLASHSIZE "2MB"
 #define CONFIG_HEAP_POISONING_DISABLED 1
@@ -39,6 +39,7 @@
 #define CONFIG_SPIFFS_CACHE 1
 #define CONFIG_INT_WDT 1
 #define CONFIG_MBEDTLS_SSL_PROTO_TLS1 1
+#define CONFIG_ESP_GRATUITOUS_ARP 1
 #define CONFIG_AWS_IOT_SHADOW_MAX_SIZE_OF_UNIQUE_CLIENT_ID_BYTES 80
 #define CONFIG_MBEDTLS_ECDSA_C 1
 #define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
@@ -162,6 +163,7 @@
 #define CONFIG_ESPTOOLPY_COMPRESSED 1
 #define CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp.csv"
 #define CONFIG_TCP_SND_BUF_DEFAULT 5744
+#define CONFIG_GARP_TMR_INTERVAL 60
 #define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
 #define CONFIG_BNEP_INITIAL_TRACE_LEVEL 2
 #define CONFIG_HCI_TRACE_LEVEL_WARNING 1
diff --git a/examples/espidf-exceptions/src/sdkconfig.h b/examples/espidf-exceptions/src/sdkconfig.h
index 2bfd734..788dcb4 100644
--- a/examples/espidf-exceptions/src/sdkconfig.h
+++ b/examples/espidf-exceptions/src/sdkconfig.h
@@ -1,6 +1,5 @@
 /*
  *
- * Automatically generated file; DO NOT EDIT.
  * Espressif IoT Development Framework Configuration
  *
  */
@@ -30,6 +29,7 @@
 #define CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE 0
 #define CONFIG_MBEDTLS_AES_C 1
 #define CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED 1
+#define CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN 752
 #define CONFIG_MBEDTLS_GCM_C 1
 #define CONFIG_ESPTOOLPY_FLASHSIZE "2MB"
 #define CONFIG_HEAP_POISONING_DISABLED 1
@@ -39,6 +39,7 @@
 #define CONFIG_SPIFFS_CACHE 1
 #define CONFIG_INT_WDT 1
 #define CONFIG_MBEDTLS_SSL_PROTO_TLS1 1
+#define CONFIG_ESP_GRATUITOUS_ARP 1
 #define CONFIG_AWS_IOT_SHADOW_MAX_SIZE_OF_UNIQUE_CLIENT_ID_BYTES 80
 #define CONFIG_MBEDTLS_ECDSA_C 1
 #define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
@@ -162,6 +163,7 @@
 #define CONFIG_ESPTOOLPY_COMPRESSED 1
 #define CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp.csv"
 #define CONFIG_TCP_SND_BUF_DEFAULT 5744
+#define CONFIG_GARP_TMR_INTERVAL 60
 #define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
 #define CONFIG_BNEP_INITIAL_TRACE_LEVEL 2
 #define CONFIG_HCI_TRACE_LEVEL_WARNING 1
diff --git a/examples/espidf-hello-world/src/sdkconfig.h b/examples/espidf-hello-world/src/sdkconfig.h
index 2bfd734..788dcb4 100644
--- a/examples/espidf-hello-world/src/sdkconfig.h
+++ b/examples/espidf-hello-world/src/sdkconfig.h
@@ -1,6 +1,5 @@
 /*
  *
- * Automatically generated file; DO NOT EDIT.
  * Espressif IoT Development Framework Configuration
  *
  */
@@ -30,6 +29,7 @@
 #define CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE 0
 #define CONFIG_MBEDTLS_AES_C 1
 #define CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED 1
+#define CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN 752
 #define CONFIG_MBEDTLS_GCM_C 1
 #define CONFIG_ESPTOOLPY_FLASHSIZE "2MB"
 #define CONFIG_HEAP_POISONING_DISABLED 1
@@ -39,6 +39,7 @@
 #define CONFIG_SPIFFS_CACHE 1
 #define CONFIG_INT_WDT 1
 #define CONFIG_MBEDTLS_SSL_PROTO_TLS1 1
+#define CONFIG_ESP_GRATUITOUS_ARP 1
 #define CONFIG_AWS_IOT_SHADOW_MAX_SIZE_OF_UNIQUE_CLIENT_ID_BYTES 80
 #define CONFIG_MBEDTLS_ECDSA_C 1
 #define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
@@ -162,6 +163,7 @@
 #define CONFIG_ESPTOOLPY_COMPRESSED 1
 #define CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp.csv"
 #define CONFIG_TCP_SND_BUF_DEFAULT 5744
+#define CONFIG_GARP_TMR_INTERVAL 60
 #define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
 #define CONFIG_BNEP_INITIAL_TRACE_LEVEL 2
 #define CONFIG_HCI_TRACE_LEVEL_WARNING 1
diff --git a/examples/espidf-http-request/src/sdkconfig.h b/examples/espidf-http-request/src/sdkconfig.h
index 2bfd734..788dcb4 100644
--- a/examples/espidf-http-request/src/sdkconfig.h
+++ b/examples/espidf-http-request/src/sdkconfig.h
@@ -1,6 +1,5 @@
 /*
  *
- * Automatically generated file; DO NOT EDIT.
  * Espressif IoT Development Framework Configuration
  *
  */
@@ -30,6 +29,7 @@
 #define CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE 0
 #define CONFIG_MBEDTLS_AES_C 1
 #define CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED 1
+#define CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN 752
 #define CONFIG_MBEDTLS_GCM_C 1
 #define CONFIG_ESPTOOLPY_FLASHSIZE "2MB"
 #define CONFIG_HEAP_POISONING_DISABLED 1
@@ -39,6 +39,7 @@
 #define CONFIG_SPIFFS_CACHE 1
 #define CONFIG_INT_WDT 1
 #define CONFIG_MBEDTLS_SSL_PROTO_TLS1 1
+#define CONFIG_ESP_GRATUITOUS_ARP 1
 #define CONFIG_AWS_IOT_SHADOW_MAX_SIZE_OF_UNIQUE_CLIENT_ID_BYTES 80
 #define CONFIG_MBEDTLS_ECDSA_C 1
 #define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
@@ -162,6 +163,7 @@
 #define CONFIG_ESPTOOLPY_COMPRESSED 1
 #define CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp.csv"
 #define CONFIG_TCP_SND_BUF_DEFAULT 5744
+#define CONFIG_GARP_TMR_INTERVAL 60
 #define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
 #define CONFIG_BNEP_INITIAL_TRACE_LEVEL 2
 #define CONFIG_HCI_TRACE_LEVEL_WARNING 1
diff --git a/examples/espidf-peripherals-uart/src/sdkconfig.h b/examples/espidf-peripherals-uart/src/sdkconfig.h
index 2bfd734..788dcb4 100644
--- a/examples/espidf-peripherals-uart/src/sdkconfig.h
+++ b/examples/espidf-peripherals-uart/src/sdkconfig.h
@@ -1,6 +1,5 @@
 /*
  *
- * Automatically generated file; DO NOT EDIT.
  * Espressif IoT Development Framework Configuration
  *
  */
@@ -30,6 +29,7 @@
 #define CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE 0
 #define CONFIG_MBEDTLS_AES_C 1
 #define CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED 1
+#define CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN 752
 #define CONFIG_MBEDTLS_GCM_C 1
 #define CONFIG_ESPTOOLPY_FLASHSIZE "2MB"
 #define CONFIG_HEAP_POISONING_DISABLED 1
@@ -39,6 +39,7 @@
 #define CONFIG_SPIFFS_CACHE 1
 #define CONFIG_INT_WDT 1
 #define CONFIG_MBEDTLS_SSL_PROTO_TLS1 1
+#define CONFIG_ESP_GRATUITOUS_ARP 1
 #define CONFIG_AWS_IOT_SHADOW_MAX_SIZE_OF_UNIQUE_CLIENT_ID_BYTES 80
 #define CONFIG_MBEDTLS_ECDSA_C 1
 #define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
@@ -162,6 +163,7 @@
 #define CONFIG_ESPTOOLPY_COMPRESSED 1
 #define CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp.csv"
 #define CONFIG_TCP_SND_BUF_DEFAULT 5744
+#define CONFIG_GARP_TMR_INTERVAL 60
 #define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
 #define CONFIG_BNEP_INITIAL_TRACE_LEVEL 2
 #define CONFIG_HCI_TRACE_LEVEL_WARNING 1
diff --git a/examples/espidf-storage-sdcard/src/sdkconfig.h b/examples/espidf-storage-sdcard/src/sdkconfig.h
index 2bfd734..788dcb4 100644
--- a/examples/espidf-storage-sdcard/src/sdkconfig.h
+++ b/examples/espidf-storage-sdcard/src/sdkconfig.h
@@ -1,6 +1,5 @@
 /*
  *
- * Automatically generated file; DO NOT EDIT.
  * Espressif IoT Development Framework Configuration
  *
  */
@@ -30,6 +29,7 @@
 #define CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE 0
 #define CONFIG_MBEDTLS_AES_C 1
 #define CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED 1
+#define CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN 752
 #define CONFIG_MBEDTLS_GCM_C 1
 #define CONFIG_ESPTOOLPY_FLASHSIZE "2MB"
 #define CONFIG_HEAP_POISONING_DISABLED 1
@@ -39,6 +39,7 @@
 #define CONFIG_SPIFFS_CACHE 1
 #define CONFIG_INT_WDT 1
 #define CONFIG_MBEDTLS_SSL_PROTO_TLS1 1
+#define CONFIG_ESP_GRATUITOUS_ARP 1
 #define CONFIG_AWS_IOT_SHADOW_MAX_SIZE_OF_UNIQUE_CLIENT_ID_BYTES 80
 #define CONFIG_MBEDTLS_ECDSA_C 1
 #define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
@@ -162,6 +163,7 @@
 #define CONFIG_ESPTOOLPY_COMPRESSED 1
 #define CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp.csv"
 #define CONFIG_TCP_SND_BUF_DEFAULT 5744
+#define CONFIG_GARP_TMR_INTERVAL 60
 #define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
 #define CONFIG_BNEP_INITIAL_TRACE_LEVEL 2
 #define CONFIG_HCI_TRACE_LEVEL_WARNING 1
diff --git a/platform.json b/platform.json
index 0442c17..bda5ead 100644
--- a/platform.json
+++ b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-espressif32.git"
   },
-  "version": "1.6.0",
+  "version": "1.7.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json",
@@ -50,7 +50,7 @@
     "framework-espidf": {
       "type": "framework",
       "optional": true,
-      "version": "~3.30102.190109"
+      "version": "~3.30103.190221"
     },
     "framework-simba": {
       "type": "framework",