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

Brian Misael Lópezrequested to merge
revert-6a569e84 into 12.0

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

Merge request reports