Merge rc/3.20 into main#21156

igfoo merged 11 commits intogithub:maingithub/codeql:mainfrom

igfoo:igfoo/mbigfoo/codeql:igfoo/mbCopy head branch name to clipboard