Merge "Improve the way of getting env values"