[ros-diffs] [sedwards] 40912: next time I'll copy the changes properly