Fixed support for disabling bundling