Revert "Merge branch 'T6923' into '17.0'"

Merged Javier Vescio requested to merge revert-029a8c6f into 17.0

This reverts merge request !135 (merged)

Merge request reports