[MOD] Several modifications based on mail from @sebastiken

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

Merge request reports