Merge branch 'jk/cached-commit-buffer'