Resolve SOF-22 "Correcciones"

Merged Marco Folco requested to merge SOF-22-Correcciones into 12.0-stage

Closes SOF-22

Merge request reports