[ros-diffs] [tkreuzer] 46046: merge r46045