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

Merged Joel Maglioni requested to merge TOM-307 into 15.0-stage

Closes TOM-307

Merge request reports