8.0 stage merge

Merged Juan Ignacio Lanosa requested to merge 8.0-stage into 8.0

Merge request reports