Code modifications must be merged onto master, but the values of the configuration in master should be retained.
Code modifications must be merged onto master, but the values of the configuration in master should be retained.