[MOD] Several minor changes

Merged Gabriel Davini requested to merge 8.0-stage into 8.0

Merge request reports