[ADD] code from server

Merged Laureano Kloss requested to merge 8.0-stage into 8.0-preprod

Merge request reports