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