Revert "Merge branch 'T4522' into '12.0'"

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

This reverts merge request !131 (merged)

Merge request reports