RE: [ros-dev] End-of-merge for some components shared with Wine