[ros-diffs] [hpoussin] 20252: Merge from trunk: