[ros-diffs] [tkreuzer] 41494: Add back the stuff I accidentilly removed with the last sync