Merge branch 'jk/fewer-pack-rescan'