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