[ros-diffs] [cgutman] 45544: - Merge from trunk up to r45543