[ros-diffs] [hbelusca] 61758: Sync to trunk revision 61757.