Fix fetching of packages.components
Add update from master