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

Merged Pablo Ferreira requested to merge revert-08f297ca into 11.0-stage

This reverts merge request !7 (merged)

Merge request reports