B04 be final changes

Merged Kilian Klammt requested to merge B04-BE-final-changes into master

Merge request reports