Revert "Merge branch 'T7117' into '12.0'"

Merged diego.barreto requested to merge revert-ceb6f179 into 12.0

This reverts merge request !8 (merged)

Merge request reports