[ros-diffs] [hbelusca] 63384: Sync with trunk r63383 .