update country.patch - do not merge yet

these chunks are applied upstream