[ros-diffs] [hbelusca] 65657: Sync with trunk r65656.