ticket1: finish
Merge branch 't1_contact'