[ros-diffs] [gvg] 18438: Merge from trunk: