[ros-diffs] [hbelusca] 75505: Sync with trunk r75504.