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

Merged Joel Maglioni requested to merge revert-2c83fbad into 15.0-stage

This reverts merge request !96 (merged)

Merge request reports