Merge recent changes