cherry-pick EnvVariable from release-7.3

Merge request reports

Loading