Merge branch 'tg/git-remote'