Merge branch 'es/unpack-trees-oob-fix' into maint