[MOD][T3655]

Merged Pablo Ferreira requested to merge T3655 into 12.0

Merge request reports