[Bug 226383] New: Merge Review: rwall