Merges https://github.com/espressif/esp-idf/pull/5687 Equivalent fix to https://github.com/espressif/esp-idf/issues/6120 for v4.0 branch
Merges https://github.com/espressif/esp-idf/pull/5687 Equivalent fix to https://github.com/espressif/esp-idf/issues/6120 for v4.0 branch