Merge "Make stackenv file visible"