Merge branch 'db/remote-builtin' into jk/send-pack