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