Merge branch 'jk/free-commit-buffer-of-skipped-commits' into maint-2.46