Use virtual resources for base packages
Merge branch 'master' into solr