Merge branch 'mh/packed-ref-store'