[ros-diffs] [tkreuzer] 41492: merge 41026 from trunk