Merge branch 'db/no-git-config'