[ros-diffs] [akhaldi] 55802: * Sync with trunk r55800.