[Bug 226327] Merge Review: pvm