[ros-diffs] Integrated change by gvg in revision 12583