Merge branch 'mh/avoid-rewriting-packed-refs' into maint