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

Merged Javier Vescio requested to merge revert-a4437798 into 11.0-stage

This reverts merge request !32 (merged)

Merge request reports