merge revision(s) 08529a61153e5c40f57a65272211357511d6e6db: [Backport #16798]
Compare environment variable names in those manor [Bug #16798]
merge revision(s) 08529a61153e5c40f57a65272211357511d6e6db: [Backport #16798]