Revert "Revert "Merge branch 'T4359' into '15.0-stage'""

Merged Joel Maglioni requested to merge T7025 into 15.0-stage

This reverts commit 66c97403.

Merge request reports