ticket:1 fixes
Merge branch 't1_person'