Merge branch 'T5704' into '17.0'

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

Fix for v15 and v17

See merge request !11 (merged)

(cherry picked from commit 76f88a23)

f868c7aa Fix for v15 and v17 09067f03 Merge branch '17.0' into 'T5704'

Merge request reports