[ros-diffs] [hbelusca] 66112: Sync with trunk r66111.