#4133 reworking bundles