Merge "Compute merged configuration changes"