Included update made in MR !2012, that has been then lost when resolving merge conflicts of MR !1901
Included update made in MR !2012, that has been then lost when resolving merge conflicts of MR !1901

www220/esp-idf,www220/esp-idf,mashaoze/esp-idf,www220/esp-idf,mashaoze/esp-idf,espressif/esp-idf,www220/esp-idf,mashaoze/esp-idf,mashaoze/esp-idf,armada-ai/esp-idf,armada-ai/esp-idf,mashaoze/esp-idf,espressif/esp-idf,armada-ai/esp-idf,www220/esp-idf,espressif/esp-idf,armada-ai/esp-idf,espressif/esp-idf