Merge branch 'tgit-22'