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