12.0 migration

Merged Federico Del Cid requested to merge 12.0-migration into 12.0-stage

Merge request reports