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

Merged Joel Maglioni requested to merge revert-3eb38cee into 17.0-stage

This reverts merge request !12 (merged)

Merge request reports