Merge branch 'sb/unpack-trees-cleanup'