[ros-diffs] [akhaldi] 55435: * Merge r55432 from trunk.