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