Merge back remaining changes from rc/3.21#21557

mario-campos merged 14 commits into

maingithub/codeql:mainfrom

rc/3.21github/codeql:rc/3.21Copy head branch name to clipboard