code as in server

Merged Luciano Ortiz requested to merge 11.0-prod into 11.0

Merge request reports