Merge branch 'nd/find-pack-entry-recent-cache-invalidation'