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