[ros-diffs] [mf] 15213: Sync to Wine: (rewritten bug fix)