Fix nationality field
Merge branch 'MH-732' into dev