[ros-diffs] [tkreuzer] 46637: merge r46636