Fix OC

Merged Jose Luis Zanotti requested to merge T6844 into 12.0

Merge request reports