Merge latest changes.