[ros-diffs] [tkreuzer] 46380: Merge trunk HEAD (r46369) (part 6/6)