[Bug 226425] Merge Review: sox