[Bug 226497] Merge Review: tog-pegasus