Merge recent updates