Revert "[TOM-307][TOM-304][TOM-301][TOM-298] rollback"

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

This reverts commit ce04671f

Merge request reports