[ros-diffs] [hbelusca] 66664: Sync with trunk r66663.