[FIX] Bugs

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

Closes JW-231

Merge request reports