Unify bdm elements

Oliver Sanderrequested to merge
unify-bdm-elements into master

Merge request reports