[ros-diffs] [hbelusca] 58690: Sync with trunk r58687.