Merge branch 'jk/prune-top-level-refs-after-packing' into maint