MT#7191 keep country field optional

like before