[Bug 226301] Merge Review: planner