[ros-diffs] [hbelusca] 63923: Sync to trunk revision 63922.