[Bug 25202] New: Merge config