Revert "Merge branch '12.0-DEFINITIVE' into '12.0'"

Merged Ariel Caruso requested to merge revert-c85f6bc1 into 12.0

This reverts merge request !216 (merged)

Merge request reports