[ros-diffs] [hbelusca] 67083: Sync with trunk r67082.