Revert "Merge branch 'T6689' into '17.0-stage'"

Merged Joel Maglioni requested to merge revert-a7543dd0 into 17.0-stage

This reverts merge request !82 (merged)

Merge request reports