[ros-diffs] [hbirr] 17384: Merged r16362:16363 from trunk.