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