[ros-diffs] [arty] 24443: Partially fixed up tree after merge from HEAD. More to do. Fixing ICE in gcc is no fun.