[ros-diffs] [akhaldi] 55545: * Sync up to trunk r55544.