[Bug 226522] New: Merge Review: valgrind