Rework bundle mode session management

Merged Mickaël Turnel requested to merge feature/bundle-rework into master

Merge request reports