[ros-diffs] [hbelusca] 63650: Sync with trunk r63649.