Merge branch 'jc/unpack-trees'