improve code

Merged Jose Luis Zanotti requested to merge T7630 into T7628

Merge request reports