Resolve JW-188

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

Closes JW-188

Merge request reports