Resolve JW-234 "B"

Merged Ignacio Goitea requested to merge JW-234b into 13.0-stage

Closes JW-234

Merge request reports