[ros-diffs] [hbelusca] 63648: Sync with trunk r63647.