[ros-diffs] [tkreuzer] 46376: Merge trunk HEAD (r46369) (part 2/x)