[MOD] Several minor changes

Merged Gabriel Davini requested to merge 8.0-fixes into 8.0-stage

Merge request reports