Added 5th point
Added city of birth
Merged conflicts with partner-upstream/master