[ros-diffs] [jimtabor] 34457: Add part of a patch by Daniel Verkamp, see bug 3441.