Fix for v15 and v17

Merged Jose Luis Zanotti requested to merge T5704 into 17.0

Merge request reports