Merge branch 'tg/use-git-contacts'