Additional merge changes.