Draft: Fix/bundle mode fix

Closed Andrea Gianarda requested to merge fix/bundle_mode_fix into master

Merge request reports