[ros-diffs] [akhaldi] 55681: * Sync with trunk r55680.