Merge "hal:updating config files"