Change environment variable to standard format

[#49091441]
Merge 49091441- to master

[#49091441]