12.0 wz o2 m

Merged Laureano Kloss requested to merge 12.0-WZ-O2M into 12.0-stage

Merge request reports