Merges https://github.com/espressif/esp-idf/pull/7113 * Original commit: espressif/esp-idf@70b1247a47