[ros-diffs] [hbelusca] 66751: Sync with trunk r66750.