18 Commits (anon-contacts-fix)