Signed-off-by: yuanjm <yuanjianmin@espressif.com> Merges https://github.com/espressif/esp-idf/pull/6370