[ros-diffs] [cgutman] 48012: [WINSOCK] - Merge r48011 from aicom-network-branch