Changes from merge.