Remerge some changes.