[ros-diffs] [tkreuzer] 39370: rbuild: merge what got lost from r38301