[ros-diffs] [hbelusca] 58114: Sync with trunk r58113.