ticket:2 fix
ticket:2 Merge branch 't2_contacts'