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