Merge "Fix logic for config file env variables"