[ros-diffs] [tkreuzer] 46553: Reintegrate header branch part 7/x Merge the rest and see what happens....