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

Merged Jose Luis Zanotti requested to merge revert-c66c83a5 into 12.0

This reverts merge request !75 (merged)

Merge request reports