Merge branch 'upstream/master' to add birthcity and birthprovince fields in user data