Revert "Revert "Merge branch 'TOM-235' into '15.0-stage'""

Merged Joel Maglioni requested to merge revert-c9b974d6 into 15.0-stage

This reverts commit c9b974d6

Merge request reports