[ros-diffs] [tkreuzer] 39365: merge r39363 from trunk