[Bug 225737] Merge Review: evolution-exchange