[ros-diffs] [cgutman] 45546: - Merge r45531 and r45545 from aicom-network-branch