Resolve JW-252

Merged Ignacio Goitea requested to merge JW-252 into 13.0-stage

Closes JW-252

Merge request reports