Bundles work with non-primary cats
Merge remote-tracking branch 'origin/master'