[ros-diffs] [hbelusca] 63794: Sync with trunk r63793.