[ros-diffs] [royce] 17830: copy&paste enhancement