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