Merge branch 'nd/unpack-entry-optim-in-pack-objects'