Revert "Merge branch 'samsagaz-12.0-patch-20215' into '12.0'"

Merged Jose Luis Zanotti requested to merge revert-213c2c1c into 12.0

This reverts merge request !40 (merged)

Merge request reports