Merge branch 'jc/unpack-trees-plug-leak'