MT#7191 keep country field optional

like before

(cherry picked from commit 236126fa950d48546479fae24113f40df0240080)