8.0 fixes

Merged Felipe Carlini requested to merge 8.0-Fixes into 8.0-stage

Merge request reports