CBI-53 use an externalised  instead of a bundle-specific one