Resolve JW-245

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

Closes JW-245

Merge request reports