Merge branch 'jk/verify-packfile-gently' into maint