Merge pull request #19023 from adityasharad/actions/env-var-query-names

Merge pull request #19023 from adityasharad/actions/env-var-query-names #8549