ticket:1 Bug fix
Merge branch 't1_contact_fix'