8.0 server mods

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

Merge request reports