ticket:5 flake, lint happy
Merge branch 't5_edit_contact'