[Bug 25202] Merge config