[MIG]8.0 to 12.0

Merged Gastón Bertolani requested to merge 12.0-merge-prod into 12.0

Merge request reports