[ros-diffs] [hbelusca] 58741: Sync with trunk r58740.