Merge rc/3.22 into main#21994

henrymercer merged 3 commits into

maingithub/codeql:mainfrom

henrymercer/mergeback-rc-3-22-into-maingithub/codeql:henrymercer/mergeback-rc-3-22-into-mainCopy head branch name to clipboard