Revert "Merge branch 'revert-13a12108' into '11.0-stage'"

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

This reverts merge request !7 (merged)

Merge request reports