Closes https://github.com/espressif/esp-idf/pull/7261 Closes https://github.com/espressif/esp-idf/issues/9531