8.0 minor changes

Merged Felipe Carlini requested to merge 8.0-Minor-changes into 8.0-stage

Merge request reports