Merge branch 'git-compat'