[ros-diffs] [hbelusca] 65567: Sync to trunk r65566.