[ros-diffs] [tkreuzer] 46024: merge r46023