[ros-diffs] [gvg] 12637: Import and merge Wine-20041201