Compatible with CodeQL CLI 2.8.0

Compatible with the latest released version of the CodeQL CLI

Compatible with CodeQL CLI 2.7.6

Merge pull request github#7653 from github/felicitymay-patch-1

Port changes from main to rc/3.3 to avoid regression

Compatible with CodeQL CLI 2.7.5

Compatible with CodeQL CLI 2.7.3

Compatible with CodeQL CLI 2.7.2

Compatible with CodeQL CLI 2.7.1

Compatible with CodeQL CLI 2.7.0

Compatible with CodeQL CLI 2.6.3