Merge branch 'jk/cat-file-regression-fix' into maint