Closes https://github.com/espressif/esp-idf/issues/13137, Closes https://github.com/espressif/esp-idf/pull/13322