Merge branch 'tr/unpack-entry-use-after-free-fix'