Merge branch 'lt/unpack-trees'