Merge branch 'rs/unpack-entry-leakfix' into maint