Merge branch 'jk/cached-commit-buffer' into maint