Merge branch 'jk/cat-file-batch-all'