code as in server

Merged Santiago Said requested to merge 8.0-prod into 8.0

Merge request reports