Merge branch 'fc/unpack-trees-leakfix'