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