Revert "Merge branch 'op-22' into '12.0'"

Open Brian Misael López requested to merge revert-6a569e84 into 12.0

This reverts merge request !9 (merged) from master into 12.0

Merge request reports