Improvements

Merged Santiago Said requested to merge Improvements into 8.0-stage

Merge request reports