[ros-diffs] Integrated change by chorns in revision 12571