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