adding support for bundles containing product reference fields