[ros-diffs] [cfinck] 444: Merge r443