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