Merging EDC changes.