merge t1_contacts to master
cleanup