Merge "Revert "Compute merged configuration changes""