[IMP] partial develop for OC report

Merged Federico Pérez Diduch requested to merge RC-328 into 12.0-stage

Closes RC-328

Merge request reports