WIP base/deposit: bundles for inspire

Rebase of my bundles on top of master and the work of Georgios Papoutsakis