[ros-diffs] [sedwards] 17444: ditto