Fix T5157

Merged Agustin Bordon requested to merge T5157 into 15.0-stage

Merge request reports