12.0 migration

Merged Agustín Isola requested to merge 12.0-migration into 12.0-stage

Merge request reports