[ros-diffs] [hbelusca] 75649: Sync with trunk r75648.