[Bug 226503] Merge Review: tree