Closes IDFCI-540 * Original commit: espressif/esp-idf@53c18a85db
* Original commit: espressif/esp-idf@4c2622755d