code as in server

Merged Facundo Benítez requested to merge 11.0-CodeAsServer into 11.0

Merge request reports