Revert "Merge branch 'T1573' into '11.0'"

Merged Javier Vescio requested to merge revert-53917614 into 11.0

This reverts merge request !31 (merged)

Merge request reports