12.0 matrix wizard

Merged Sebastian Kennedy requested to merge 12.0-matrix-wizard into 12.0-stage

Merge request reports