Merge "Change the location of a configuration file"