Improve Code

Merged Jose Luis Zanotti requested to merge T7654 into 15.0-stage

Merge request reports