[Bug 226493] Merge Review: tix