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