[Bug 226112] Merge Review: lv