Merge branch 'nd/unpack-trees-with-cache-tree'