Merge "Modify the configuration files"