ticket:4 tests fail
ticket:4 tests pass
Merge branch 't4_contact'