[ros-diffs] [hbelusca] 70541: Sync with trunk revision r70539.