WIP Tree with CM cherry-picks