[ros-diffs] [tkreuzer] 45186: Merge trunk r45185