Merge branch 'jk/rev-parse-local-env-vars'