Merge "adding env vars to eventually replace the -r -c params"