Merge pull request #1015 from github/codeql/upgrade-to-2.21.4

Merge pull request #1015 from github/codeql/upgrade-to-2.21.4 #3349