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