[ros-diffs] [hbelusca] 63744: Sync with trunk r63743.