[ros-diffs] [tkreuzer] 34910: sync with trunk head (34904)