[ros-diffs] [akhaldi] 55822: * Sync with trunk r55820.