Merge "Add missing packages"