Feature environment variable substitution support

Pulling this feature into the dev branch.