[ros-diffs] [mf] 15210: Sync to Wine: