Uncommited changes from RRHH

Merged Facundo Barral requested to merge CodeAsServer into 12.0-RAF-RRHH

Merge request reports