Regression from 81d496ace9080fcd97df3cc7e9ce279531d67a48 * Original commit: espressif/esp-idf@c0d08faf91
Closes IDF-4132 * Original commit: espressif/esp-idf@e0d5fca390