Merge branch 'wc/packed-ref-removal-cleanup'