Merge branch 'env-vars' into dt-test