8.0 so/po

Merged Julián Corso requested to merge 8.0-so/po into 8.0-stage

Merge request reports