Fix/bp

Merged Sylvain Berfini requested to merge fix/bp into release/6.0

Merge request reports