ticket:3 tests fail
ticket:3 tests pass
Merge branch 't3_contact'