Merge "Add functionality for reading ENV variables"