[ros-diffs] [jimtabor] 22378: Sync with wine.