Fixes after bm02 tests

Merged Wout De Nolf requested to merge fixes_after_bm02_tests into main

Merge request reports