ticket:8 tests pass
Merge branch 't8_contact'