* Original commit: espressif/esp-idf@766aa57084
Closes IDF-3072 * Original commit: espressif/esp-idf@a06357ab62