[ADD] JW-283

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

Closes JW-283

Merge request reports