[FIX] Country

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

Closes JW-228

Merge request reports