Closes https://github.com/espressif/esp-idf/issues/2965
Closes https://github.com/espressif/esp-idf/issues/3011