Merge branch 'kg/packed-ref-cache-fix'