[Bug 225722] Merge Review: ElectricFence