Revert "Merge branch 'fix' into '12.0'"

Merged Jose Luis Zanotti requested to merge revert-62ee0651 into 12.0

This reverts merge request !201 (merged)

Merge request reports