Merge "Refactor PC_TREE root handling." into nextgenv2