Closes https://github.com/espressif/esp-idf/issues/2572 Closes https://github.com/espressif/esp-idf/issues/2350