Signed-off-by: Chirag Atal <chirag.atal@espressif.com> Merges https://github.com/espressif/esp-idf/pull/2654