[ADD] code as in server

Merged Santiago Said requested to merge 12.0-prd into 12.0

Merge request reports