Resolve JW-210

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

Closes JW-210

Merge request reports