Legacy variable substitution
Merge pull request #1 from genesis/legacy-variable-substitution

Legacy variable substitution