Merge with earlier changes.