[ros-diffs] [gvg] 20346: Sync to Wine-0_9_4: