[Bug 226527] Merge Review: vino