[ros-diffs] [pschweitzer] 42624: Other resync. Now branch builds up to gdi32.