Signed-off-by: Prasad Alatkar <prasad.alatkar@espressif.com> Merges https://github.com/espressif/esp-idf/pull/5825