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