Se bmxd rework sub1

Stephanrequested to merge
se-bmxd-rework-sub1 into se-bmxd-rework

Merge request reports