Address and Ethnicity show fix
Merge origin/master