Merge branch 'jh/unpack-trees-micro-optim'