T5261 Change compute methods

Merged Agustin Bordon requested to merge T5261 into 15.0-stage

Merge request reports