8.0 improvements

Merged Santiago Said requested to merge 8.0-Improvements into 8.0-stage

Merge request reports