Bundle configuration
Merge branch 'bundles'