[ros-diffs] [jimtabor] 32733: Finish Stefan Ginsberg patch from rev 32726.