Merge branch 'bugfix/github_diverged' into 'master'

fix Github master branch diverged from Gitlab master branch

See merge request espressif/esp-idf!22550