[Bug 226301] New: Merge Review: planner