Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1