Merge latest updates from main packages repo