[ros-diffs] [tkreuzer] 46582: Merge the rest from header branch.