Merge changes from topic "Supplicant_merge_June24" into main

* changes:
  [wpa_supplicant] cumilative patch from commit 4b755c967
  [wpa_supplicant] cumilative patch from commit 3a5d1a7e6