[Bug 225739] Merge Review: evolution (not started)