ticket:5 tests pass
ticket:5 minor changes
Merge branch 't5_contact'