[T7491] comment fixes

Merged Joel Maglioni requested to merge T7491 into 17.0-stage

Merge request reports