Resolve JW-264

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

Closes JW-264

Merge request reports