[ros-diffs] [cfinck] 51049: Merge r51046-r51048