[ros-diffs] [arty] 35551: Hand merge a lost change from aicom-network-fixes.