[ros-diffs] [hbelusca] 63285: Sync with trunk r63283