[ros-diffs] [hbelusca] 58607: Synchronize with trunk r58606.