[ros-diffs] [tkreuzer] 43125: Sync with trunk r43123