Merge branch 'mh/packed-ref-store-prep' into maint