12.0 migration

Merged Laureano Kloss requested to merge 12.0-Migration into 12.0-stage

Merge request reports