[ros-diffs] [hbelusca] 63832: Sync with trunk r63831.