Revive bundle system
This contains the three first commits from !11 (closed) which revive bundle-system
and remove the deprecation marker.
This contains the three first commits from !11 (closed) which revive bundle-system
and remove the deprecation marker.