Merges https://github.com/espressif/esp-idf/pull/4985 * Original commit: espressif/esp-idf@266be00254