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