Merge "Fix the tree diagram comment." into nextgenv2