[ros-diffs] [hbirr] 17386: Merged r16363:16600 from trunk.