[T7484] Fix span

Merged Joel Maglioni requested to merge T7484 into 17.0-stage

Merge request reports