12.0 merge

Merged Gastón Bertolani requested to merge 12.0-merge into 12.0-rv-162-statistics-report

Merge request reports