12.0 wip changes

Closed Sebastian Kennedy requested to merge 12.0-wip_changes into 12.0-stage

Merge request reports