Merge pull request #2527 from tannewt/idf5.2.1

Tweaks for ESP-IDF 5.2.1