Merge recent updates.