* Original commit: espressif/esp-idf@93a902ba80
Closes IDF-4132 * Original commit: espressif/esp-idf@e0d5fca390