Merge latest updates