Merge "Move environment configuration to the config file"