Merge branch 'jk/git-connection-deadlock-fix' into maint