Resolve JW-274

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

Closes JW-274

Merge request reports