JBIDE-13336 JBIDE-13329: Bundles...