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