[FIX][T5537]

Merged Pablo Ferreira requested to merge T5537 into 15.0-preStable

Merge request reports